Skip to content
GitLab
Closed
Issue created by jan tapulgo@jantaps2k

Line Concatenated after Resolving Merge Conflict

What steps will reproduce the problem?

Upon Merge Conflict

  1. Open a conflicted file with the default TortoiseGit editor.
  2. Fix the conflicted problem. Note: Must be more than 2 consecutive line conflict problem. And resolution must still be more than 2 consecutive line after fix. Ex: Conflicted line in 65-68 After Resolution of conflict: 65-68
  3. Mark as Resolve.
  4. Open the File again and go to the fixed conflicted lines. The lines are then concatenated into a single line.

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

The lines should not be concatenated.toUpload

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

  • TortoiseGit: 2.6.0.0, 2.7.0.0 then Downgraded to 2.4.0.2
  • Git: 2.14.1
  • OS: Windows 10x64bit (OS Build 17134.228)

Please provide any additional information below.

Check out as-is, Commit as-is

Edited by Sven Strickroth
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information