Skip to content

Error when pulling change from remote that adds two or more non-IRIS code files #273

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

Closed
isc-pbarton opened this issue Aug 21, 2023 · 0 comments · Fixed by #274
Closed

Error when pulling change from remote that adds two or more non-IRIS code files #273

isc-pbarton opened this issue Aug 21, 2023 · 0 comments · Fixed by #274

Comments

@isc-pbarton
Copy link
Collaborator

Steps to replicate:

  1. Set up two local git repos cloning the same remote
  2. Set up an IRIS instance using git-source-control configured with one of the repos
  3. On the other repo, add two files that are not IRIS code. Commit and push to the remote.
  4. With VS Code server-side editing the IRIS instance, open the Server Side Source Control menu and click the "Pull changes from remote branch" option.

I get a frightening message in the output window:

Pulling from branch: main
Fetch done
Files that will be modified by git pull: 
    A        test5.txt
    A        test6.txt
Updating e40f870..d5a9148
Fast-forward
 test5.txt | 0
 test6.txt | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test5.txt
 create mode 100644 test6.txt

ERROR #5002: ObjectScript error: <SUBSCRIPT>AddToServerSideSourceControl+4^SourceControl.Git.Utils.1 ^SYS("SourceControl","Git","items","")
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 a pull request may close this issue.

1 participant