workflow help

[Bryan Murdock]

On Jun 6, 2017 2:50 PM, "Chuck Kirschman" <Chuck.Kirschman at bentley.com>
wrote:

The only documentation I can find describes how a "git pull --rebase" seems
to recognize that the changesets are the same and so A1/A2 disappear
whereas with Hg it is a conflict.

Have you tried this?  My experience is that mercurial actually does a
better job than git of automatically resolving these kinds of rebases.

Bryan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20170606/f241647b/attachment-0002.html>