From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Sat, 14 Nov 2009 02:12:59 GMT
Subject: Re: [PATCH] Re: Clarify documentation on the "ours" merge strategy.
Message-ID: <20091114111259.6117@nanako3.lavabit.com>
In-Reply-To: <alpine.DEB.2.00.0911121034580.8825@ds9.cixit.se>

Quoting Peter Krefting <peter@softwolves.pp.se>

> The web tree checkout script uses rebase to avoid introducing merge
> commits every time the blog comment is updated, as it in 99 % of cases
> is unrelated to any other changes found in the central repo.
>
> In the few cases where the blog comment update from the web tree
> conflicts with a change in the central repo, I want the "git pull
> --rebase" call to overwrite any changes in the central repo with my
> changes in the web tree (meaning that I would later have to manually
> re-delete the spam comments, but I can live with that).

That sounds like "-Xours" merge option that was discussed some time 
ago. See

    http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=89021

I remember that Junio and Petr were against it because it would 
encourage a bad workflow. Dscho was against the syntax used to 
pass the options also.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/