From: Tom Clarke <tom@u2i.com>
Date: Mon, 01 Oct 2007 22:21:21 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <550f9510710011521s126ca747v956a6f80182444bb@mail.gmail.com>
In-Reply-To: <87ejgescnb.wl%cworth@cworth.org>

On 10/2/07, Carl Worth <cworth@cworth.org> wrote:
> What I think I've always wanted is something like the following
> behavior for "git pull":
>
>   * Fast forward if possible
>
>   * Otherwise, rebase, but only if there are no conflicts at all
>
>   * Otherwise, do the merge as normal, (leave conflict markers in
>     place allowing the user to fix them up and then commit).
>
> Would it be straightforward to turn your rebase merge strategy into
> something like the above? And if so, would that address the primary
> concerns that Junio raised?

Maybe we need a 'pull' strategy' - merge, rebase or <insert name for
strategy you describe above>.

-Tom