git-pickaxe: simplify Octopus merges further