Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
peauc opened this issue Jun 4, 2024 · 2 comments
Open

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

peauc opened this issue Jun 4, 2024 · 2 comments
Labels
enhancement New feature or request

Comments

@peauc
Copy link

peauc commented Jun 4, 2024 •
edited
Loading

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
@peauc peauc added the enhancement New feature or request label Jun 4, 2024
@peauc peauc changed the title Add a loader when doing git merge --continue Merge conflict resolution: Add a loader while executing git merge --continue Jun 4, 2024
@belyakov-am
Copy link
Contributor

belyakov-am commented Jun 6, 2024 •
edited
Loading

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

@peauc
Copy link
Author

peauc commented Jun 6, 2024

@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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@peauc @belyakov-am