Mercurial branching strangeness
I am trying to understand why the following is happening:
alt text http://img185.imageshack.us/img185/8301/capturexj.png
It looks like I started a new branch, but I don't have a name and I don't remember creating a new branch. Why was this new head (branch) created? How can I avoid this?
+2
a source to share
1 answer
This will happen if you upgrade your working directory to an earlier version and start making changes. After you commit the "fix the invalid link" you made hg update
, which brought you back to revising the secondary address update.
Easy to fix, make sure your working directory is at the tip first, then hg merge -r fix_broken_link
+2
a source to share