How can I execute `git checkout --ours XXX` with lazygit

[xclidongbo]

Topic
How can I execute git checkout --ours XXX with lazygit

Your thoughts
execute git checkout --ours XXX with lazygit

[mark2185]

Currently only through running a custom command, i.e. pressing : and typing in the command you wish to run.

Where have you needed this use case?

[xclidongbo]

Resolve a lot of conflicts in one file. for example, one hundred of conflictes.

[Ryooooooga]

customCommands:
  - key: H
    command: git restore --ours {{.SelectedFile.Name | quote}}
    context: mergeConflicts
    subprocess: true
  - key: L
    command: git restore --theirs {{.SelectedFile.Name | quote}}
    context: mergeConflicts
    subprocess: true

[xclidongbo]

@Ryooooooga Good idea.

[cskeeters]

As of two weeks ago, this feature is on master by pressing M. It used to prompt confirmation for running git mergetool, but now it brings up "Resolve merge conflicts" where ours, theirs, both, and running git mergetool, are all options.

703f053