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

Don't show Failed to Import popup after overwriting the file on server once #311

Merged
merged 4 commits into from
Jan 4, 2024

Conversation

isc-vgao
Copy link
Contributor

@isc-vgao isc-vgao commented Jan 4, 2024

This fixes #264.

Testing Steps:

  1. In git-source-control repo, checkout overwrite-server-popup branch
git checkout overwrite-server-popup
  1. In VS Code, click the ObjectScript icon in the left side menu to open ObjectScript Explorer window, click "Choose Server and Namespace" and sign in using InterSystems Server Credentials.
  2. Load git-source-control into the current namespace
zpm "load <path to local git-source-control repo cloned in step 1>"
  1. Modify a file you haven't overwritten on server
  2. Save the file you modified in step 3. Verify that "Failed to import" VS Code popup shows up on the first time you modify and save the file.
  3. Click "Overwrite on Server"
  4. Modify file from step 3 and save the file. Verify that "Failed to import" VS Code popup no longer shows up.
  5. Undo changes to file you modified.

@isc-vgao isc-vgao self-assigned this Jan 4, 2024
@isc-tleavitt isc-tleavitt merged commit 523d12e into main Jan 4, 2024
2 checks passed
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

Successfully merging this pull request may close these issues.

while installed VSCode reports the versions differences between client and server for every change
2 participants