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
  • #357

Closed
Open
Created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Fix line endings merging issue

By lpapp.b... on April 07, 2010 13:02 (imported from Google Code)


  1. Do a fresh pull operation on Linux client
  2. Do a fresh pull operation on Windows client with TortoiseGIT
  3. Modify a file in that repository on Linux
  4. Commit that change on Linux
  5. Pull that change on Linux
  6. Change the same file on Windows
  7. Commit this change on windows with TortoiseGIT
  8. Try to pull on windows client with TortoiseGIT from the remote repository
  9. You will experience a merge conflict, try to solve it from mine e.g.
  10. Click for the Resolved in the menu, and you will get a fatal error
    popup window about the CR+LF line endings.

The CRLF settings are on windows:
- Checked AutoCRLF
- Checked SafeCRLF

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