jesseduffield
Merge conflict resolution: Add a loader while executing `git merge --continue`
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
Absolutely agree on this one. First time I encountered it I exited LazyGit because I though something was broken
@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
Sometimes it seems to be a good minute that it hangs - this time I was only only merging 1 commit ~100loc from upstream into my branch! Other times it is chill, haven't spotted a pattern yet.
