Giters

gitpod-io / openvscode-server

Run upstream VS Code on a remote machine with access through a modern web browser from any device, anywhere.

Home Page:https://www.gitpod.io/

Repository from Github https://github.comgitpod-io/openvscode-serverRepository from Github https://github.comgitpod-io/openvscode-server

--wait doesn't appear to work quite right?

colemickens opened this issue · comments

commented

I'm running this command from a terminal inside OpenVSCode-Server:

jj \
  --config-toml='ui.merge-editor="openvscode-server"' \
  --config-toml='merge-tools.openvscode-server.merge-args=["--wait", "--merge", "$left", "$right", "$base", "$output"]' \
  resolve

While I'm able to do the merge as I might expect, saving and closing the file does not return / complete the --wait.

Is there something else I can do here to successfully use OpenVSCode-Server as my merge tool?