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.

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

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

Open
colemickens opened this issue Nov 9, 2024 · 0 comments
Open

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

colemickens opened this issue Nov 9, 2024 · 0 comments

Comments

@colemickens
Copy link

colemickens commented Nov 9, 2024

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant