jesseduffield / jesseduffield/lazygit

When a conflict occurs during rebase, show which commit was being applied

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

Description

**Is your feature request related to a problem? Please describe.**
When I rebase and there's a conflict, I like to look at the original commit (pre-rebase) to help me remember what the commit was doing so I can handle the conflict appropriately.

When I perform a rebase using the git CLI, when a conflict occurs, git logs the commit it was trying to apply when the conflict occurred:

```sh-session
$ git rebase --interactive master
CONFLICT (modify/delete): app/services/api/photos/types.ts deleted in HEAD and modified in 218c9455f2... Move types into photo modules. Version 218c9455f2... Move types into photo modules of app/services/api/photos/types.ts left in tree.
error: could not apply 218c9455f2... Move types into photo modules
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 218c9455f2... Move types into photo modules
```

**Describe the solution you'd like**
When I perform a rebase using lazygit, when a conflict occurs, lazygit should show the commit which was being applied when the conflict occurred—similar to how the git CLI works. For example, it could show this in the command log.

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.