Re: git add -p and unresolved conflicts

Junio C Hamano <gitster@pobox.com> writes:

Designing a per-hunk behavior would clearly be very tricky.

But a simple way to deal with this would be to show the whole-file patch, and ask "stage this file (yes/no)?".

My fingers are used to typing

git add -p y y y git commit

and they would appreciate if it worked in the presence of conflicts. Most of the time, I have small conflicts, so a whole-file behavior wouldn't be disturbing, but I like seeing the changes before commiting them.