From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Mon, 02 Nov 2009 21:34:48 GMT
Subject: Re: git pull --rebase and losing commits
Message-ID: <20091103063448.6117@nanako3.lavabit.com>
In-Reply-To: <200911021604.24066.trast@student.ethz.ch>

Quoting Thomas Rast <trast@student.ethz.ch>

> It is *not*
> the often requested (but ill-defined and hence never implemented)
> "resolve all conflict hunks in favour of ours" strategy.

This was implemented and posted here quite some time ago.

  http://thread.gmane.org/gmane.comp.version-control.git/85163/focus=85602

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