Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • 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 835
    • Issues 835
    • List
    • Boards
    • Service Desk
    • Milestones
  • 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
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #4642

Closed
Open
Created Dec 12, 2016 by Bitbucket Importer@bitbucket_importerOwner

3-way diff crash when manually resolving merge conflicts

Created originally on Bitbucket by matteosistisette (matteo sisti sette)

I was doing a merge and there were conflicts to be resolved.

I chose "tool resolve". This automatically opened the 3-way diff tool (I think this behavior has changed: before it would show you the list of automatically resolved files and you would have to manually select each of them and click on "3-way diff"), for one file at a time one after the other.

After editing a few files, (each time, by closing the 3-way diff window, a new one would pop up with the following file with conflicts), at the N-th one, something crashed. See the attachment.

This is very critical: you definitely don't want stuff to crash just when you are manually resolving merge conflicts.

Attachments: Screenshot_from_2016-12-12_18-48-30

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