Re: git add -p and unresolved conflicts

Holger Hellmuth [off-list ref] writes:

and additionally the following three options:
b - choose the base version
< - choose our version

quoted

- choose their version

What does it mean to "choose" in this context? In general, it means "put
this into the index", but if the file is in conflicted state, you have 3
different versions of the file in the index.

And you miss the most usefull (to me at least): "choose the version in
the worktree".

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/