News for hackers. Stuff that matters.

A comment on Extremely Linear Git History. Parent comment

Re:Extremely Linear Git History by kzrdude on Tuesday November 22, 2022 @09:02AM (#33705847)
Merge and conflict resolution is a minefield if unexperienced developers do it too. Fortunately it can (often) be arranged that those with some understanding of the issues involved can do the resolution.
[ Parent | on HN ]
Re:Extremely Linear Git History by cerved on Tuesday November 22, 2022 @03:33PM (#33711088)
you get the same, and often more, conflicts using rebase
[ Parent | on HN ]
Re:Extremely Linear Git History by z3t4 on Wednesday November 23, 2022 @01:43AM (#33715973)
Always clone to another folder before merging ;)
[ Parent | on HN ]