[BUG] error "Cannot commit on a repo with state: MERGING"

[goodoo1000]

log copy.txt

Version of Archi, Operating System

v5.0.0, macOS Sonoma v14.2.1

Version of this plug-in

coArchi 0.8.7.202212021111 and coArchi Command Line 0.8.7.202212021111

Any other plug-ins installed?

Not as far as I'm aware.

Expected Behaviour

Successful merge

Actual Behaviour

When merging a 2 branches, I resolved conflicts and then the merge appeared to have been completed. However, when I try to commit to the brand that was to be merged into, I get the following error "There was an error: Cannot commit on a repo with state: MERGING".

Steps to Reproduce the Behaviour

The error occurs each time I attempt a commit on this branch.

[Phillipus]

It's not possible to diagnose the problem here without actually having access to the repo and model. If possible try to revert to a known good version of the model.

[goodoo1000]

Hi Phil …

I appreciate that’s it’s a difficult ask and do I appreciate your assistance.

Could you please advise, is my best option to “Restore to this commit”?

Regards Javi

Javier Perez Architect Business Systems Mobile: +61 411 118 184 Email: @.**@./>

NEXTDC (ASX: NXT) www.nextdc.comhttp://www.nextdc.com/

From: Phil Beauvoir @.> Date: Thursday, 29 February 2024 at 10:48 pm To: archimatetool/archi-modelrepository-plugin @.> Cc: Javier Perez @.>, Author @.> Subject: Re: [archimatetool/archi-modelrepository-plugin] [BUG] error "Cannot commit on a repo with state: MERGING" (Issue #217) You don't often get email from @.*** Learn why this is importanthttps://aka.ms/LearnAboutSenderIdentification

It's not possible to diagnose the problem here without actually having access to the repo and model. If possible try to revert to a known good version of the model.

— Reply to this email directly, view it on GitHubhttps://github.com/archimatetool/archi-modelrepository-plugin/issues/217#issuecomment-1970837344, or unsubscribehttps://github.com/notifications/unsubscribe-auth/A6ES43GG4RF44ITE5HLU4U3YV4KPNAVCNFSM6AAAAABD7T7RVKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSNZQHAZTOMZUGQ. You are receiving this because you authored the thread.Message ID: @.***>

The information contained in this email and any attachments may be confidential. This email and any attachments are also subject to copyright. No part of them may be reproduced, adapted or transmitted without the written permission of the copyright owner. If you are not the intended recipient, any use, interference with, disclosure or copying of this information is unauthorised and prohibited. If you have received this email in error, please immediately advise the sender by return email and delete the message from your system. All email communications to and from NEXTDC Limited are recorded for the purposes of archival and storage.

[Phillipus]

Could you please advise, is my best option to “Restore to this commit”?

Hi, you could try that and see if that solves it.

[goodoo1000]

Hi again Phil …

Looks like I can’t restore to an earlier commit as I continue to get the error stating the repo’s status is ‘Merging’.

I assume the status refers to an internal GitHub status. The last successful commit in both Archi and GitHub is the same … @.*** I’m interpreting that to mean that the GitHub repo is all good. I can’t seem to find any sort of status for the repo nor any indication of merge requests, so I can’t check that.

So I’m left with the idea that the coArchi plugin maintains a status of Merging from an incomplete merge request and that somehow I need to reset that status.

Any suggestions how I might achieve this?

As a last resort … I may have to export the model, delete the repo and create a new repo. Your thoughts pls.

Perhaps I don’t delete the current repo and just lock it down to a read only?

As always, your advice is very welcome …

Cheers Javi

Javier Perez Architect Business Systems Mobile: +61 411 118 184 Email: @.**@./>

NEXTDC (ASX: NXT) www.nextdc.comhttp://www.nextdc.com/

From: Phil Beauvoir @.> Date: Monday, 4 March 2024 at 8:24 pm To: archimatetool/archi-modelrepository-plugin @.> Cc: Javier Perez @.>, Author @.> Subject: Re: [archimatetool/archi-modelrepository-plugin] [BUG] error "Cannot commit on a repo with state: MERGING" (Issue #217) You don't often get email from @.*** Learn why this is importanthttps://aka.ms/LearnAboutSenderIdentification

Could you please advise, is my best option to “Restore to this commit”?

Hi, you could try that and see if that solves it.

— Reply to this email directly, view it on GitHubhttps://github.com/archimatetool/archi-modelrepository-plugin/issues/217#issuecomment-1976102580, or unsubscribehttps://github.com/notifications/unsubscribe-auth/A6ES43CPSJYOALRGBBG45PDYWQ4SNAVCNFSM6AAAAABD7T7RVKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSNZWGEYDENJYGA. You are receiving this because you authored the thread.Message ID: @.***>

The information contained in this email and any attachments may be confidential. This email and any attachments are also subject to copyright. No part of them may be reproduced, adapted or transmitted without the written permission of the copyright owner. If you are not the intended recipient, any use, interference with, disclosure or copying of this information is unauthorised and prohibited. If you have received this email in error, please immediately advise the sender by return email and delete the message from your system. All email communications to and from NEXTDC Limited are recorded for the purposes of archival and storage.

[jbsarrodie]

Hi, even though the root cause is not the same, you can apply this procedure: https://github.com/archimatetool/archi-modelrepository-plugin/wiki/File-is-not-directory-or-folder.xml-does-not-exist

[goodoo1000]

Thanks for all your help Jean-Baptiste … it seems that I’ve corrected the problem … not sure I know exactly how, but it’s now committing properly.

Many thx once again … Javier

Javier Perez Architect Business Systems Mobile: +61 411 118 184 Email: @.**@./>

NEXTDC (ASX: NXT) www.nextdc.comhttp://www.nextdc.com/

From: Jean-Baptiste Sarrodie @.> Date: Tuesday, 5 March 2024 at 6:13 pm To: archimatetool/archi-modelrepository-plugin @.> Cc: Javier Perez @.>, Author @.> Subject: Re: [archimatetool/archi-modelrepository-plugin] [BUG] error "Cannot commit on a repo with state: MERGING" (Issue #217) You don't often get email from @.*** Learn why this is importanthttps://aka.ms/LearnAboutSenderIdentification

Hi, even though the root cause is not the same, you can apply this procedure: https://github.com/archimatetool/archi-modelrepository-plugin/wiki/File-is-not-directory-or-folder.xml-does-not-exist

— Reply to this email directly, view it on GitHubhttps://github.com/archimatetool/archi-modelrepository-plugin/issues/217#issuecomment-1978098686, or unsubscribehttps://github.com/notifications/unsubscribe-auth/A6ES43ALYECPCOOQCP67KT3YWVWCFAVCNFSM6AAAAABD7T7RVKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSNZYGA4TQNRYGY. You are receiving this because you authored the thread.Message ID: @.***>

The information contained in this email and any attachments may be confidential. This email and any attachments are also subject to copyright. No part of them may be reproduced, adapted or transmitted without the written permission of the copyright owner. If you are not the intended recipient, any use, interference with, disclosure or copying of this information is unauthorised and prohibited. If you have received this email in error, please immediately advise the sender by return email and delete the message from your system. All email communications to and from NEXTDC Limited are recorded for the purposes of archival and storage.