Mercurial Merge

   

The Mercurial Merge action merges the working directory with another revision. Merge is often called after a set of changes have been pulled into the current repository.

 

NB The user will be prompted to interactively resolve conflicts in files that cannot me automatically merged.

 

mercurial_merge

 

 

Revision

The revision to merge. If not specified and the branch contains exactly one other head, merge will use that head. Otherwise, it needs to specified.

 

Force

Merge even with outstanding (uncommitted) changes.

 

Preview

Review the revisions to merge (no merge is performed).