How to auto-merge 2 heads with mercurial
问题 We just changed over to mercurial from subversion and there is one thing that is taking up more time than expected; merging heads. We love the fact that it keeps merges independent from the 2 commits (compared to subversion) but we end up on a regular basis merging 2 heads for unrelated changes. Simple scenario. Both me and Bob are up to date. We both have ou repo up to date on default (aka main) branch and do improvement in different files. We commit and only one will be able to push to the