PyCharm
 
2021.2
Get PyCharm
You are viewing the documentation for an earlier version of PyCharm.

Merge dialog (Mercurial)

Last modified: 21 April 2021

VCS | Mercurial | Merge

context menu of the Editor - Mercurial | Merge

VCS | Mercurial | Branches - <branch name> - Merge

context menu of the Editor - Mercurial | Branches - <branch name> - Merge

Use this dialog to merge the current working directory to a named branch, light-weight branch (bookmark), or a specific changeset identified by a tag, hash, or revision number.

By default, Mercurial requires that before merge the current working directory should be clean, that is, it should not contain any uncommitted changes. Otherwise the merge operation fails and PyCharm shows the corresponding error message. The message also recommends that you clean the current working directory by running the hg merge <target branch, bookmark, or changeset> -C to discard the uncommitted changes.