jesseduffield / jesseduffield/lazygit

fatal: it seems that there is already a rebase-merge directory

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

Description

**Describe the bug**
I'd like to edit an old commit, but get the error message mentioned in the title.

**To Reproduce**
Steps to reproduce the behavior:

- GIVEN a commit I'd like to edit,
- WHEN pressing "e" to edit commit
- and changing a file
- and staging that file in lazygit
- and pressing "A" to amend the commit which I originally selected with "e" (the `<-- you are here` commit)
- and confirming that I want to amend the commit with staged files
- THEN I get the error message: "fatal: it seems that there is already a rebase-merge directory"

**Expected behavior**
I assumed that the commit would be amended.

**Version info:**
_Run `lazygit --version` and paste the result here_

commit=367b0d331836c90c015bf0c45f88612f3d94d08a, build date=2022-07-20T09:27:56Z, build source=binaryRelease, version=0.35, os=linux, arch=amd64

_Run `git --version` and paste the result here_

git version 2.25.1

**Additional context**
I'm running lazygit in a vscode console. Is it possible that vscode creates some files which lazygit does not expect?

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.