Home/ Questions/Q 8267687
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-08T05:37:24+00:00

Sometimes I can’t seem to be able to track the merge conflicts. I need

  • 0

Sometimes I can’t seem to be able to track the merge conflicts.
I need a command that allows me to discard one of my uncommitted files and then update it with the remote copy.

I tried hg revert myfile followed by hg pull , hg commit
but it still won’t let me merge or commit.

It keeps telling me to fix unresolved conflict first.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You might need to let Mercurial know that you have resolved the conflict, using hg resolve. From the man page:

    hg resolve [OPTION]... [FILE]...

redo merges or set/view the merge status of files

  Merges with unresolved conflicts are often the result of non-interactive
  merging using the "internal:merge" configuration setting, or a command-
  line merge tool like "diff3". The resolve command is used to manage the
  files involved in a merge, after "hg merge" has been run, and before "hg
  commit" is run (i.e. the working directory must have two parents). See "hg
  help merge-tools" for information on configuring merge tools.

  The resolve command can be used in the following ways:

  - "hg resolve [--tool TOOL] FILE...": attempt to re-merge the specified
    files, discarding any previous merge attempts. Re-merging is not
    performed for files already marked as resolved. Use "--all/-a" to select
    all unresolved files. "--tool" can be used to specify the merge tool
    used for the given files. It overrides the HGMERGE environment variable
    and your configuration files.  Previous file contents are saved with a
    ".orig" suffix.
  - "hg resolve -m [FILE]": mark a file as having been resolved (e.g. after
  having manually fixed-up the files). The default is to mark all
  unresolved files.
  - "hg resolve -u [FILE]...": mark a file as unresolved. The default is to
    mark all resolved files.
  - "hg resolve -l": list files which had or still have conflicts. In the
    printed list, "U" = unresolved and "R" = resolved.

  Note that Mercurial will not let you commit files with unresolved merge
  conflicts. You must use "hg resolve -m ..." before you can commit after a
  conflicting merge.

    Here’s how you pick up the version of the file from the server.
    When you “hg pull”, all changes from the server come into your copy of the repository. You can get the contents of a file in any revision using:

    hg cat -r <rev> <file>

    Use that to overwrite the local file, and commit.

    • 0