Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 301
    • Issues 301
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 8
    • Merge requests 8
  • Requirements
    • Requirements
    • List
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Analytics
    • Analytics
    • CI/CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2655

Closed
Open
Created Nov 26, 2015 by Dmytro Kutianskyi@dmytro-kutyansky

Resolve does not work on multiple selection during deleted-modifed conflict resolution

What steps will reproduce the problem?

  1. Do a merge or rebase that causes conflict in multiple files (make sure there are deleted-modifed conflicts)
  2. Choose files that cause conflict and select one of resolve options (Resolve, Resolve using "their")
  3. Only one file will have conflict resolved

What is the expected output? What do you see instead?

On step 3 all files should have conflict resolved

What version of TortoiseGit and Git are you using? On what operating system?

TortoiseGit 1.8.15.0 git version 2.6.2.windows

Please provide any additional information below.

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