Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • meld meld
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 197
    • Issues 197
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 4
    • Merge requests 4
  • 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
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOMEGNOME
  • meldmeld
  • Issues
  • #54
Closed
Open
Issue created Apr 27, 2013 by Bugzilla@bugzilla-migration💬Reporter

[BZ#699037] allow conflict resolution to be reverted

Submitted by Adam Dingle

Link to original bug (#699037)

Description

All too often, after I've resolved conflicts in a file (but before committing) I realize I've made an error and I want to go back and merge the changes in that file again. Today, once I've resolved a conflict in Meld there's no way I can go back to the previous unresolved state. In git, the right command to get there is 'git checkout -m':

http://gitster.livejournal.com/43665.html

I think in Meld the Revert command should probably always run 'git checkout -m'. I believe this command will work correctly in the simple case of reverting everyday changes, and it can also restore the state before a merge resolve.

Assignee
Assign to
Time tracking