Merge union order

Cédric Krier cedric.krier at b2ck.com
Sat Jan 14 09:54:30 UTC 2023


Hi,

In our repository we are filling a CHANGELOG text file when developing
new feature. The rule is to append on top of the file new entries.
The problem is that obviously we have very often merge conflict with
that file. So in order to simplify the merge process, I though about
using `internal:union` tool. This works great but instead of having the
new entry on top, it is merged at the bottom of the conflict.
So is there a way to tell `internal:union` to unify the other way?

Thanks,
-- 
Cédric Krier - B2CK SPRL
Email/Jabber: cedric.krier at b2ck.com
Tel: +32 472 54 46 59
Website: https://www.b2ck.com/


More information about the Mercurial mailing list