Hi, Dave Abrahams <dave@xxxxxxxxxxxx> writes: > Dave Abrahams <dave <at> boostpro.com> writes: > >> I often find myself pursuing a development branch ... > > Sorry, my ASCII art was messed up in the previous message. > Here's what I meant: > > o-o-o-o origin/dev > \ > o-o-o dev > > > o-o-o-o - -o origin/dev dev > \ / > o-o-o You can use the 'ours' merge strategy. On the 'dev' branch, you do git merge -s ours origin/dev Now 'origin/dev' is a parent of the new 'dev', while the tree contents haven't changed. You can now push 'dev' back to origin without any hassles. - Hari -- 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