4 ms·

Is there some practice around making sure the octopus-merged branches concern separate files (have no conflicts)? Imagine resolving a 12-way merge conflict. Yee

• paxswill 6y ago
  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 https://git-scm.com/docs/merge-strategies 1: https://devblogs.microsoft.com/oldnewthing/20190918-00/?p=102901 https://devblogs.microsoft.com/oldnewthing/20190918-00/?p=10...