5 ms·
> "Christ, that's not an octopus, that's a Cthulhu merge" Perhaps git should throw a warning when you try to do an octopus merge with more parents than an octo
by kijin 10y ago
> "Christ, that's not an octopus, that's a Cthulhu merge"
Perhaps git should throw a warning when you try to do an octopus merge with more parents than an octopus has legs. If you really want to proceed, add the --cthulhu option. The default behavior would be --no-cthulhu.