Start Mercurial updating to public failed

Mercurial updating to public failed

If you include --file, --user, or --date, the revision number is suppressed unless you also include --number.

It first tries a few fully automatic merging tools; if these don't succeed (because the resolution process requires human guidance) or aren't present, it tries a few different graphical merging tools.

It's also possible to get Mercurial to run a specific program or script, by setting the For each conflicting portion of the file, we can choose to resolve the conflict using some combination of text from the base version, ours, or theirs.

If it finds that the changes added a new head to the repository, it updates to the new head, begins a merge, then (if the merge succeeded) commits the result of the merge with an automatically-generated commit message.

This could be useful if, for example, we were running a graphical merge tool and quit because we were confused or realised we had made a mistake.

Our task in resolving the conflicting changes is to decide what the file should look like.

Mercurial doesn't have a built-in facility for handling conflicts.

We can also manually edit the merged file at any time, in case we need to make further modifications.