blog/2017/new-mercurial-workflow/

[ahal]

https://ahal.ca/blog/2017/new-mercurial-workflow/

[ahal]

Yarik Sheptykin wrote on 2017-01-11 06:47:38

Thanks for sharing!

I have been using this workflow for about a year now and can report that rebase extension is not very helpful when conflicts arise. This makes bookmark workflow comfortable for short-lived patches. Whenever you changeset lives long enough to race with somebody else's work you will have hard times keeping up with central. rebase would live you with a bunch of .rej files without hinting where the merge broke. This problems might affect changesets that touch many things. To my experience using mq in such situations is more comfortable.

[ahal]

ahal wrote on 2017-01-11 15:39:54

Whether .rej files show up or not depends on how you have mercurial configured. For example, you could install meld (http://meldmerge.org/), then add:

[ui]
merge = meld

To your hgrc. Now when hitting conflicts you'll be using a proper 3-way merge tool. I use meld and have not seen .rej files since switching from mq. Meld is just one example, you could use kdiff3 or vimdiff or whatever you want.