On Tuesday, January 15, 2013 11:48:33 PM UTC+1, Carsten wrote:
>> My guess is that it has just always behaved that way, and changing it now
> would surprise too many users. Personally I would find it very disturbing
> if "merge" started modifying my index (the only commands that should modify
> my index are "add" and "reset"..).
merge modifies your index already when running into a conflict
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.