We converted several thousands of files from another VCS to Git, then checked them out and pushed them to Bitbucket repos. Some of these files now show as 'merging' in SourceTree and other clients. This blocks merging of new versions. How can we turn off this flag to allow merging?
Atlassian Team members are employees working across the company in a wide variety of roles.
April 23, 2020 edited
Hi Frank!
Have you performed any merge operations in these new repositories? If so, you may be able to cancel the merge. I'm not too familiar with Sourcetree myself, but you could try this command to abort a merge:
git merge --abort
If that fails, you could try
git reset --hard HEAD
Note that any uncommitted changes in the repository will be removed by this command.
Hope this helps!
Cheers,
Wolfgang
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.