I forget to do a Pull in SourceTree (Hg) and Push changes. Boom! Conflict due to two heads.
This is a common mistake. WHY do I find no Help on your Support site???
I made a Search for "Mercurial merge branches" and got NOTHING! That sucks!
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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