Eclipse mercurial conflict after pull: how to select a remote file

Question

I have a repository on a bitbucket, and I pulled from it a set of changes in Eclipse using the Mercurial plugin. Some files in Eclipse have been modified, so it causes conflicts.

I just want to abandon the local file and update it using remotes. So I right-click and select the "Sync with

But what should I click to select a remote file and abandon the local one?

Answer 1

Just right-click on the file and select "Undo" since you want to undo your changes.

However, in general, if you are not indifferent to your changes, it is not recommended to update the updated workspace. Instead, make your changes first, and then drag or merge them after pulling.

• Refund - this eliminates uncommitted changes. This makes the contents of the file the same as in the last commit.
• Update - this moves the working directory towards the latest topological head in the current branch.
• Rebase is moving a perfect set of changes from where it was originally made to be based on the target set of changes. When in doubt, use merging rather than rebase, since rebase is an extended operation.

The problem with uncommitted updating of the workspace is that if there are conflicts, there is no easy way to return to the previous state. If there are merge or rebase conflicts, and you don’t want to resolve them now, you can click the Abort button in the Mercurial Merge view and it will revert to what it was before.

Answer 2

In Eclipse I can do

• right click file in package explorer
• Replace with
• Other changes
• select the last set of changes from the remote repository