Skip to content

GitLab

  • Menu
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 187
    • Issues 187
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 5
    • Merge requests 5
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOME
  • meldmeld
  • Issues
  • #172

Closed
Open
Created Mar 19, 2018 by yurivict@yurivict

"Mark conflict as resolved" doesn't work

In a subversion repository one file is in conflict and is shown in red. Meld allows to edit it, save, then it asks "Mark conflict as resolved?". Pressing "Mark resolved" doesn't actually mark it resolved.

meld-3.18.0

Edited Mar 19, 2018 by yurivict
Assignee
Assign to
Time tracking