News for hackers. Stuff that matters.

A comment on The biggest and weirdest commits in Linux kernel Git history (2017).

Re:The biggest and weirdest commits in Linux kernel Git hist... by brundolf on Friday December 25, 2020 @03:12PM (#25538697)
Is there some practice around making sure the octopus-merged branches concern separate files (have no conflicts)? Imagine resolving a 12-way merge conflict. Yeesh.
[ Parent | on HN ]
Re:The biggest and weirdest commits in Linux kernel Git hist... by paxswill on Friday December 25, 2020 @03:45PM (#25538901)
Octopus merge will fail if there are any conflicts that require manual resolution [0], but there are ways around this like manually creating the commit. Raymond Chen had a has some interesting posts using this to split files while preserving blame history [1] (the manual method is linked at the beginning).

0: https://git-scm.com/docs/merge-strategies

1: https://devblogs.microsoft.com/oldnewthing/20190918-00/?p=10...

[ Parent | on HN ]