# Mercurial: Merge Revisions Dialog Box

The Merge Revisions dialog displays following a pull from an external repository.

Element | Description
--- | ---
Incoming changeset | Required changeset (usually the tip) to be merged with changes in your local repository.

When you affirm this dialog, the two changesets are combined into a new changeset that describes how they combine.

If conflicts arise during the merge, you must resolve these, by either using an independent merge program or manually in the IDE's Source Editor.

Related Topics

Developing Applications with NetBeans IDE,

Copyright © 2016, Oracle and/or its affiliates. All rights reserved.