Resolving conflicts: how to accept “their” changes automatically? January 1, 2023 by Tarik Use hg resolve -t internal:other --all to accept theirs and hg resolve -t internal:local --all to accept yours