Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 839
    • Issues 839
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #4673
Closed
Open
Issue created Jan 28, 2017 by Bitbucket Importer@bitbucket_importerOwner

No option to merge into local discarding local changes (i.e. keep "other")

Created originally on Bitbucket by Anonymous

Let's say I have a default branch and a somebranch branch. I want to merge them into the default branch, keeping everything "as is" from the somebranch branch. That is, wherever there might be any sort of conflict, take the somebranch version. Override the local version completely.

There should be an obvious no-brainer option to do that from TortoiseHG, and there isn't.

I update to the tip of the default branch, then I right-click on the tip of the somebranch branch, and I get the dialog in the attached screenshot. There's an option "discard all changes from the other revision". That's great, but there should also be an exactly opposite option: "discard all changes from the local revision".

Of course you can just normally merge, and then in the list of conflicting files, choose "keep other" for each one. But you shouldn't have to go through all that.

Attachments: thg

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking