PhpStorm 8.0.0 Web Help

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 box 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 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.

Item Description
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.
Merge with In this area, choose the branch, bookmark, or changeset to merge with.
  • Branch: choose this option to switch to another line of development identified by a branch name and merge to the branch head. Choose the desired branch from the drop-down list which shows all the named branches available in the current repository.
  • Tag: choose this option to merge to a changeset to which you have previously assigned a tag identifier. Choose the relevant tag from the drop-down list.

    The list shows both local tags (from .hg/localtags) and global tags (from .hgtags).

  • Bookmark: choose this option to switch to another line of development which is identified by a bookmark and merge to its head. Choose the relevant bookmark from the drop-down list which shows all the available light-weight branches in the current repository.
  • Revision: choose this option to merge to a specific changeset identified by its hash or revision number. In the text box, type the relevant revision number or paste the hash. To copy a hash, open the Log tab of the Changes tool window, select the relevant branch and revision, and then choose Copy Hash on the context menu of the selection.

See Also

Procedures:

Web Resources: