jesseduffield / jesseduffield/lazygit

Interactive rebase commit problems

Open
#547 8 comments 0 reactions 0 assignees View on GitHub
bug subprocesses usability
Dominant language
Go
Stars
82.4k
Forks
3k
Avg merge
2d 18h
Merged PRs (30d)
19

Description

**Describe the bug**
When performing an interactive rebase (as a result of conflicts during a cherry-pick), lazygit attempts to do something with neovim, but fails, giving the following error:
![image](https://user-images.githubusercontent.com/20801821/69488448-abacdc00-0e26-11ea-8cd5-24a0fe97692b.png)

**To Reproduce**
1. Cherry pick a commit from one branch to another that will have conflicts
2. Resolve the conflicts (in my case, by editing the file)
3. Once done editing the file, lazygit prompts with "Conflicts have been fixed. Would you like to continue?" (or something along those lines)
4. Upon hitting enter, I get the beautiful mess that is the error message.
5. The error will continue to appear if I try to hit "continue"

For reference, most of the error appears to be part of the original commit message:
```gitcommit
Implement udiskie into config.yml and i3 config

- Add config.yml for udiskie to ignore snap app mounts
- i3 config: launch udiskie on startup

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Date: Sat Nov 23 19:09:46 2019 -0700
#
# interactive rebase in progress; onto ec9e90f
# Last command done (1 command done):
# reword 81e0d2d Implement udiskie into config.yml and i3 config
# No commands remaining.
# You are currently editing a commit while rebasing branch 'YogaManjaro' on 'ec9e90f'.
#
# Changes to be committed:
# modified: .config/i3/config
# new file: .config/udiskie/config.yml
```

**Expected behavior**
I'm new to lazygit, so I'm not sure *exactly* what it was supposed to do, but I'm guessing it's supposed to submit a commit message identical to the cherry-picked one to finish of the rebasing

**Desktop (please complete the following information):**
- OS: Manjaro
- Lazygit Version: 0.11.2

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.