Stephen Leake <stephen_le...@stephe-leake.org> writes: > So it appears that adding a file _does_ tell git that the conflict is > resolved.
Yes it does. Git _knows_ that you consider the conflict to be resolved. It cannot know how happy you are with the result. Similarly, in a conflicted merge, the last "git add" does not trigger a commit silently. And a silent commit would be much less serious than a silent data drop. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
