Bonnie Corwin <Bonnie.Corwin at Sun.COM> writes: > Hi, > > I have made updates to http://opensolaris.org/os/community/tools/scm. > > and to > > http://opensolaris.org/os/community/tools/scm/hg_teamware_transition. > > I tried to lay out the information on the main page to be a little > easier to parse. > > And I added input from jbeck (thank you very much!) to the transition page.
The transition page states that resolve(1) and 'hg merge' are similar. I don't think that's actually the case, a couple of discussions in the last week or so suggest people are generally confused about why they *have* to merge to bring two heads together, even when there are no file conflicts, and, beyond that, while that means that if they have local changes they'll always need to do an 'hg merge'. I'm not sure I know, right now, how to explain that, but I'd expect it to cause at least some confusion. -- Rich
