Skip to content

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

@peauc

Description

@peauc

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions