3 ms·
> Cherry-pick is just applying a delta from a commit and then re-committing. That’s trivially not true from its conflict resolution abilities. A cherrypick is
by masklinn 4y ago
> Cherry-pick is just applying a delta from a commit and then re-committing.
That’s trivially not true from its conflict resolution abilities. A cherrypick is a merge which does not create a merge commit, it’s a lot “smarter” that “git show -p | git patch”