Sorry, that lacked complete sense: Thank you - FWIW, it is shaping up very well. In turns out that in cases where the original merge was resolved in favour of the _rebased branch_, the compensation can be squashed with the compensated commit - effectively bringing the eventual resolution of the conflict forward in time. jon. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html