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
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 PhpStorm 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.
|Repository||From this drop-down list, choose the repository to run the merge in. The contents of the Branch, Tag, and Bookmark drop-down lists are updated to show the branches, tags, and bookmarks that are available in the selected repository.|
In this area, choose the branch, bookmark, or changeset to merge with.