Re: Automatically marking conflicts are resolved

[Stephen J. Turnbull]

Óscar Fuentes writes:

 > I'm wary of using commits as temporary storage for work-in-progress
 > on merges or any other atomic change. A distraction at the wrong
 > moment may cause big trouble.

I don't see how this can cause more trouble than any time a train of
thought gets interrupted, and the developer incautiously proceeds to
commit and push.