Re:Git cherry-pick and revert use 3-way merge
by jkubicek on Friday November 10, 2023 @02:56PM
(#38223694)
Rebasing isn't that hard, but you also spent 8 paragraphs explaining it. Explaining merging just takes one paragraph: Copy all the changes from the main branch into my branch, if someone changed the same line that I changed, then create a merge conflict and manually figure out which change is right.
[ Parent
| on HN ]
Re:Git cherry-pick and revert use 3-way merge
by AlotOfReading on Friday November 10, 2023 @03:31PM
(#38224106)
Their explanation is one sentence. The rest is context, examples, and useful extensions of the basic idea (e.g. interactive rebases).
Re:Git cherry-pick and revert use 3-way merge
by dale_glass on Friday November 10, 2023 @03:21PM
(#38224003)
It's a matter of taste really, there are pros and cons to both.
Rebase also can produce merge conflicts when doing the rebase. Sometimes that makes resolving them easier and sometimes harder.