Re:Git cherry-pick and revert use 3-way merge
by xg15 on Saturday November 11, 2023 @04:50AM
(#38228863)
It's also really useful to understand rebases. At least for me the insight that a rebase is a series of 3-way-merges made a lot of the errors and the infamous "repeating merge conflicts" problem finally understandable.
[ Parent
| on HN ]
There are no comments on this comment yet.