I'm working on a big project using Mercurial. I had local changes to a few files, and a colleague committed changes to one of those files to our central repository. Before committing my changes to my local repository, I decided to do a pull and an update. Now, Sourcetree is listing the simultaneously modified file twice in the pending changes view.
Is this normal or a bug? If it's normal, how should I do my commit now?
This is a bug, but I can't see how it could happen, I can't reproduce it here. The way you query general file status and merge status is separate in hg, so we query both then merge the results based on the path, but in your screenshot the paths clearly match 100%.
You can still go ahead and commit - just allow all the file entries to be checked in the commit dialog (this is required for merges anyway, you have to commit everything) and it will still work fine. I'll try to figure out how this edge case might have occurred.
A vulnerability has been published today in regards to Sourcetree for Windows. The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...
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