Very interesting, thank you. Especially that this discussion has been so recent indeed.
So after reading through that thread I had a look at git-merge-octopus.sh <https://git.kernel.org/pub/scm/git/git.git/tree/git-merge-octopus.sh?h=main> itself. I understand that it is a design decision to not to make octopus merges with manual conflict resolution easy. I still think that that is a petty and that it would be useful. On the other hand, implementing it would mean reimplementing git-merge-octopus almost completely. So I guess I will just hack together a custom solution for me. If I should stumble about a solution that can be generalized somewhat easily then I will report back. Thanks a lot, Johannes -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/78da8ed5-f8ca-48e2-9fb7-80a4e49248b0n%40googlegroups.com.
