News for hackers. Stuff that matters.
Re:Git cherry-pick and revert use 3-way merge by heavenlyblue on Saturday November 11, 2023 @12:35PM (#38232410)
You can rebase while keeping all of the commits in your feature branch, you will just be asked to resolve conflicts for each one of them (if any).

I don't understand what the fuss is all about.

There are no comments on this comment yet.