archimatetool / archi-modelrepository-plugin

coArchi - a plug-in to share and collaborate on Archi models.
151 stars 52 forks source link

[BUG] Merge branch error ... 'File is not directory or folder.xml does not exit' #219

Closed goodoo1000 closed 2 months ago

goodoo1000 commented 3 months ago

log copy.txt

Version of Archi, Operating System

Mac OS Sonoma 14.2.1

Version of this plug-in

0.8.7.202212021111

Any other plug-ins installed?

No

Expected Behaviour

When I resolve conflicts, I expect merge to complete and request if delete the branch

Actual Behaviour

When I resolve conflicts, I get a dialog box titled 'Merge Branch' with the following text ... "There was an error: File is not directory or folder.xml does not exit"

Steps to Reproduce the Behaviour

  1. select Merge Branch into Current Branch
  2. resolve conflicts
  3. error
Phillipus commented 3 months ago

Hi, please read this https://github.com/archimatetool/archi-modelrepository-plugin/wiki/File-is-not-directory-or-folder.xml-does-not-exist

goodoo1000 commented 2 months ago

thanks very much for that ... appears I need to look deeper into this ...