Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

jesseduffield / lazygit Public

Notifications You must be signed in to change notification settings
Fork 2k
Star 57.7k

Code
Issues 749
Pull requests 72
Discussions
Actions
Projects 1
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security
Insights

Fix merge conflict resolution when file doesn't end with a LF#3976

Merged

stefanhaller merged 4 commits intomasterjesseduffield/lazygit:masterfrom fix-merge-conflict-resolutionjesseduffield/lazygit:fix-merge-conflict-resolutionCopy head branch name to clipboard

Oct 13, 2024

Conversation Commits4 (4)Checks Files changed

Commits

Commits on Oct 9, 2024

Extract helper function for easier testing
stefanhaller
committed
Add test demonstrating problem with ForEachLineInFile
stefanhaller
committed
Add regression test for resolving conflicts in a file without a trailing LF
stefanhaller
committed
Fix ForEachLineInFile to not lose the last line if it doesn't end with a LF
stefanhaller
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.