News for hackers. Stuff that matters.

A comment on Extremely Linear Git History. Parent comment

Re:Extremely Linear Git History by piskerpan on Tuesday November 22, 2022 @08:46AM (#33705687)
If you’re merging (and not rebasing) it’s the same exact thing. You’re just switching the “incoming” version, but conflicts will be identical.
[ Parent | on HN ]

There are no comments on this comment yet.