lazygit icon indicating copy to clipboard operation
lazygit copied to clipboard
verified publisher icon jesseduffield

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

Open pengatgstdev opened this issue 1 year ago • 1 comments

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 avatar Mar 27 '24 14:03 pengatgstdev

same here

farnsworth3010 avatar Jul 22 '24 16:07 farnsworth3010

+1

wlgemini avatar Aug 30 '24 10:08 wlgemini

+1

Sticks-Stones avatar Sep 17 '24 07:09 Sticks-Stones

+1

wdixon-bzs avatar Oct 07 '24 16:10 wdixon-bzs

+1

mwebb-bzs avatar Oct 07 '24 16:10 mwebb-bzs

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

stefanhaller avatar Oct 09 '24 13:10 stefanhaller