Committing conflicts (was: Equivalent to Mercurial's 'fetch')

[Stefan Monnier]

> We don't generally auto-commit merges for a few reasons.  One is that
> users may want to check the merge was semantically correct as well as
> having no technical conflicts, eg by looking at the diff or running
> some tests.  Another is that there is some potential for user
> confusion if you sometimes have to explicitly commit and sometimes
> not.

Is there a way to commit a tree that has conflicts?
This may not be often needed, but when a large merge needs to be done
collaboratively by various people, it can come in very handy.


        Stefan