From: Raja R Harinath <harinath@hurrynot.org>
Date: Mon, 10 May 2010 08:03:22 GMT
Subject: Re: Instead of rebasing, etc....?
Message-ID: <87ljbsdvzp.fsf@hariville.hurrynot.org>
In-Reply-To: <loom.20100507T004928-336@post.gmane.org>

Hi,

Dave Abrahams <dave@boostpro.com> 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