archimatetool / archi-modelrepository-plugin

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

pb with merge a branch and master #185

Closed nadinew closed 2 years ago

nadinew commented 2 years ago

master is current branch try to merge mybranch in master message : cannot pull into a repository with state:merging_resolved mybranch is current try to merge master into current branch message : cannot pull into a repository with state:merging_resolved

on a branch who the merge didn't go to the end mybranch is current try to merge master into current branch

file is not a directory or folders.xlm does not exist

on another branch when commit in master whe have the message "cannot commit on a repo with state:merging"

beetween last month and this one a lot of folders disapears from master ( we don't know why...and there are multiple users) and we see nothing like this in gitlab)..so we need some help