Erik Faye-Lund <kusmabite@xxxxxxxxx> writes: > So, the options are: > 1) Keep the current behavior > 2) Abort with an error immediately if one of the picked paths are in > a conflicted state > 3) Abort with an error when first encounter a path that is in a > conflicted state > 4) Warn and skip any paths that are in a conflicted state > 5) Implement "git add -p" for conflicted files (if we can agree on a behavior) > > 1) and 3) makes little sense to me. I do not think 1, 2, or 3 makes any sense to me if you are proposing to change anything. Why did you even bother to list them? Given that you wrote "(if we can...)" for #5, in the short term, #4 is the only sensible thing to do, I would think. -- 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