On 29.03.2012 08:08, Jeff King wrote:
On Wed, Mar 28, 2012 at 09:52:55PM +0200, Holger Hellmuth wrote:
On 28.03.2012 21:19, Junio C Hamano wrote:
Holger Hellmuth<hellmuth@xxxxxxxxxx> writes:
I don't think it's that tricky:
I was assuming this "tricky" was about a sensible user interface.
I think maybe the discussion elsewhere in this thread has given you a
taste of the trickiness, but if you want to read more, here is a similar
discussion from the same time last year (ahh, Spring, when a young man's
thoughts turn to partial staging of conflicted hunks):
It already dawned on me that to add the proposed conflict resolution
would also mean changing the working copy of the file which none of the
other options needs. Which would change the work from (assumed) surgical
changes to completely new routines and special cases and....
--
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