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

Make auto-staging resolved conflicts optional #3870

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Make auto-staging resolved conflicts optional #3870

merged 2 commits into from
Sep 2, 2024

Commits on Sep 2, 2024

  1. Actually look for conflict markers in GetHasInlineMergeConflicts 

    So far, lazygit has always auto-staged files as soon as the conflict markers
disappeared from them, which means that we could rely on any file that still had
a status of "UU" to still contain conflict markers.

We are going to make the auto-staging optional in the next commit, and in that
case the user will want to manually stage "UU" files; so we must now check
whether the file contains conflict markers, and disallow the staging in that
case.
    @stefanhaller
    stefanhaller committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    1191aca View commit details
    Browse the repository at this point in the history

  2. Add config git.autoStageResolvedConflicts

    @stefanhaller
    stefanhaller committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    90b8fd2 View commit details
    Browse the repository at this point in the history