Skip to content

Instantly share code, notes, and snippets.

@bgruening

bgruening/mercurial_fix_merge_conflicts.md

Created May 5, 2019 18:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bgruening/0ace74a5e8bd1d31389edd3beb0c256e to your computer and use it in GitHub Desktop.
Save bgruening/0ace74a5e8bd1d31389edd3beb0c256e to your computer and use it in GitHub Desktop.
Download ZIP
mercurial (hg) resolve merge conflicts by accepting upstream changes
Raw
mercurial_fix_merge_conflicts.md

~/venv/bin/hg resolve -t internal:other --all

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment