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?
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!
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events