Is Subversion better at cherry-picking then git (or any DAG VCS)?
I just read http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html and seems that
svn:mergeinfo can track info about single commit merge which happen at cherry-picking.
That avoid merge conflict when you merge back your feature-branch with cherry-picked bug-fixes to original branch (where you made bug-fixes before).
Here funny ASCII art (which people like at SO):
o--o--o--o--o feature ^ ^ \ / / v -o--o--o--X--o---o---Y--o--> dev
X – only single changeset (essential/blocker fix that we move from
I try and found that
Git have conflicts in
Y merge if you have made changes at lines which effected by fix
X already. While
SVN just skip that changeset from merge.
UPDATE That leads DAG VCS users to use
bisect and аштв common ancestor from bisect and branches for fix propagation. So you can make clean history.
One Solution collect form web for “Is Subversion better at cherry-picking then git (or any DAG VCS)?”
You may want to read up on
rerere, which is short for “reuse recorded resolution”. Git can remember how you resolved conflicts in the past and reuse those resolutions later, but you have to enable the feature.
git config rerere.enabled true will enable this feature in your repository (or use
--global if you want to enable it by default on this machine for this user).