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!
What is even worse is I search for just "merge" and got this.
It looks like you're new here. Sign in or register to get started.