Skip to content

Merging default remote branch does not import changed code #503

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 Sep 30, 2024 · 1 comment · Fixed by #506
Closed

Merging default remote branch does not import changed code #503

isc-pbarton opened this issue Sep 30, 2024 · 1 comment · Fixed by #506
Assignees
Labels
bug Something isn't working release blocker

Comments

@isc-pbarton
Copy link
Collaborator

isc-pbarton commented Sep 30, 2024

In Basic mode, if I Sync and have a default merge branch configured, changes rebased from the default merge branch do not actually get imported and compiled into IRIS.
The way we are diffing across the rebase to list files that have changed never shows any changes.
The reason we never caught this before is because we would test by opening the changed item in VS Code, which calls the OnBeforeLoad to load the item from disk.

@isc-tleavitt
Copy link
Collaborator

@isc-pbarton this is a really great catch, thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment