Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #357
Closed
Open
Issue 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
Time tracking