Peng Qin

Results 2 issues of Peng Qin

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

1 comment

**Describe the bug** Conflict during merge, lost last line of code after resolving conflict **To Reproduce** 1. merge code 2. resolving conflict **Screenshots** ![image](https://github.com/jesseduffield/lazygit/assets/19773374/ed7f8a04-c25c-4579-8ad7-045500882a5b) ![image](https://github.com/jesseduffield/lazygit/assets/19773374/321073ba-ea85-43d0-8ee2-40992bb4db7c) ![image](https://github.com/jesseduffield/lazygit/assets/19773374/5088e220-8feb-4cdc-bfda-01cad80a4503) ![image](https://github.com/jesseduffield/lazygit/assets/19773374/d8668c3d-d4a6-4a30-9d16-fe930a931605) **Version info:** `lazygit...

bug

请求添加支持Wayland协议转发

8 comment

**目前open-ssh仅支持X11转发, 请求trzsz-ssh能支持Wayland协议转发**