jesseduffield / jesseduffield/lazygit

Merge conflict resolution: Add a loader while executing `git merge --continue`

Open
#3,635 4 comments 8 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.**
During a merge with conflicts when pressing enter to continue after resolving the conflicts, Lazygit looks like it hangs but it will succeed after a few seconds of wait time

**Describe the solution you'd like**
A simple loader when the merge --continue is working

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.