Hi,
How about a simple "I've merged Gerd's into staging, yours conflicts, please re-base" on-list? Then I could reply with "Cool, re-base pushed to vnet-hdr.v2 in my tree" and you could merge that?
Problem with that is that staging is a moving target (i.e. rebases frequently). I'll never ever base any of my branches on staging, this is just asking for trouble.
"I've merged into master, please rebase" would work for me though. cheers, Gerd
