Re: Move to git is imminent - awaiting Stefan's approval

[Stefan Monnier]

>> and (probably conditional on a config var)
[...]
> The config var is important.

I know some people are very ticklish about it, which is why I mentioned
the config var.  I think the default should be to have the feature
enabled.

> Here, conflict is considered solved only after testing the changes (does
> it compile? does it pass the regression tests?.)

When Git resolves concurrent changes automatically, it doesn't mark the
file as "there was an unchecked change in here", so for the same reason
I think the default behavior of vc-git + smerge-mode should be to remove
the "conflicted" mark on files after the user has removed all
diff3 markers.


        Stefan