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

jesseduffield / lazygit

simple terminal UI for git commands

MIT License

51.38k stars 1.8k forks source link

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

Open peauc opened 4 months ago

peauc commented 4 months ago

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

belyakov-am commented 3 months ago

Absolutely agree on this one. First time I encountered it I exited LazyGit because I though something was broken

peauc commented 3 months ago

@belyakov-am Same. I have a few commit hooks that takes time before commit-ing, it took me a few tries to understand they were working :D