Randy Barlow wrote:
It's not an either-or. If you resolve the conflict, you can have
fast-
forwarding *and* not pass irrelevant/confusing changelogs on to the end
user.
I personally avoid if statements in spec files and just resolve
conflicts.
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).
In addition, resolving conflicts is extra work compared to a conflict-free
merge or ideally a fast-forward.
Kevin Kofler