Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflict during merge, lost last line of code after resolving conflict #3444

Closed
pengatgstdev opened this issue Mar 27, 2024 · 6 comments · Fixed by #3976
Closed

Conflict during merge, lost last line of code after resolving conflict #3444

pengatgstdev opened this issue Mar 27, 2024 · 6 comments · Fixed by #3976
Labels
bug Something isn't working

Comments

@pengatgstdev
Copy link

Describe the bug
Conflict during merge, lost last line of code after resolving conflict

To Reproduce

  1. merge code
  2. resolving conflict

Screenshots

image
image
image
image

Version info:
lazygit --version
commit=3675570a391b1a49ddd198b4c7e71e17701d4404, build date=2024-03-23T09:09:11Z, build source=binaryRelease, version=0.41.0, os=linux, arch=amd64, git version=2.33.1
git --version
git version 2.33.1

uname -a
Linux my 6.1.32-amd64-desktop-hwe #23.01.00.20 SMP PREEMPT_DYNAMIC Thu Jan 11 18:45:10 CST 2024 x86_64 GNU/Linux

@pengatgstdev pengatgstdev added the bug Something isn't working label Mar 27, 2024
@farnsworth3010
Copy link

same here

@wlgemini
Copy link

+1

3 similar comments
@Sticks-Stones
Copy link

+1

@wdixon-bzs
Copy link

+1

@mwebb-bzs
Copy link

+1

@stefanhaller
Copy link
Collaborator

As far as I can see, this happens whenever the file in question doesn't end with a line feed.

Here's a fix for that: #3976

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging a pull request may close this issue.

7 participants