[alsuren]

I found the virtual branches compelling, but when I tried it out, I got myself into a mess.

I think that this could all be done using real branches, plus an integration branch with post-commit hooks to backport each commit onto the "default" branch and recreate the octopus merge "integration" commit each time. Would that work, or am I missing something?