On Sat, 2019-10-05 at 02:38 +0200, Kevin Kofler wrote:
No. Resolving conflicts implies that you need to do an actual merge,
NOT a
fast forward. Fast-forwarding means that I am shipping the SAME
commit on
all branches, so the changelog must be identical (unless I play games
with
%if in the changelog, which is not going to happen).
The same commit is in all branches, there's just also a merge commit.
Subsequent commits that don't conflict do fast-forward.
In addition, resolving conflicts is extra work compared to a
conflict-free
merge or ideally a fast-forward.
It's less work than the mental overhead of working in a spec file with
%if statements.