Re: [x264/f30: 7/7] Merge branch 'f29' into f30
On Friday, 04 October 2019 at 10:23, Nicolas Chauvet wrote:
Please consider to use cherry-pick next time.
I don't see the point to compute a merge resolution for the changelog
because of a single fix.
This is craziness.
Cherry-picking only makes sense when the branches are too diverged. I
did cherry-pick from f29 to el7 for that reason. The others are more or
less the same. All the fixes that went into all branches should have
been applied to the oldest applicable branch first and then merged
upwards. This wasn't done, hence the current merge commits look uglier
than they could be. They will be much cleaner in the future if this
workflow is followed.
Christopher over at fedora devel list has some valid points in favour of
this way[1]:
Git has excellent branch merging features. Merging branches, rather than
cherry-picking across them, results in commits representing the same
changeset being present in multiple branches, making it easier to search
git history and identify which branches contain a specific change.
Regards,
Dominik
[1]
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
--
Fedora https://getfedora.org | RPM Fusion http://rpmfusion.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
-- from "Collected Sayings of Muad'Dib" by the Princess Irulan