News for hackers. Stuff that matters.
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.

There are no comments on this comment yet.