Running git checkout --ours of --theirs as a custom command results in the error **unable to unlink old <filename> : Invalid argument**

[samaursa]

Hi,

This is the custom command that I have

  - key: 'R'
    description: "Resolve conflict"
    commandMenu:
      - key: 'O'
        description: "Use ours for selected file"
        command: "git checkout --ours {{.SelectedFile.Name}}"
        context: files
      - key: 'T'
        description: "Use theirs for selected file"
        command: "git checkout --theirs {{.SelectedFile.Name}}"
        context: files

The command shows up. But then results in this error:

I am able to perform the exact same command in CLI without issues. The files are not locked.

[samaursa]

Using indirected command to powershell as a workaround, but would love to know why the original does not work:

  - key: 'R'
    description: "Resolve conflict"
    commandMenu:
      - key: 'O'
        description: "Use ours for selected file"
        command: cmd /c "powershell -NoProfile -Command \"git checkout --ours -- '{{.SelectedFile.Name}}'\""
        context: files
      - key: 'T'
        description: "Use theirs for selected file"
        command: cmd /c "powershell -NoProfile -Command \"git checkout --theirs -- '{{.SelectedFile.Name}}'\""
        context: files

[stefanhaller]

Do your file names contain spaces by any chance? I notice that your Powershell workaround has single quotes around the file name, and the original one doesn't. Another difference is the -- before the filename in the Powershell workaround, this is missing in the original version; but I doubt that this explains it.

Apart from that, no idea, sorry.