Skip to content
GitLab
  • Menu
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 829
    • Issues 829
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & 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
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #5555
Closed
Open
Created Jun 18, 2020 by Bitbucket Importer@bitbucket_importerOwner

TortoiseHG commits unchecked chunks between the merge wizard finishing and committing by hand

Created originally on Bitbucket by gmb1226 (Greg Besack)

Today while merging, I found a line of code I wanted to back out of the merge commit that wasn't available to change as part of the conflict resolution window. It was a bit of debug code left in. So after the merge wizard finished, I did a “Commit Later” so I could change it before the merge.

I clicked on the offending source file, and unchecked the code chunk. Then I clicked commit to finalize the merge.

When I viewed the resulting merge, this chunk was still included in the merge, even though I unchecked it.

I expected the chunk to be excluded from the merge commit and left in the stating area.

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