ignore deletions from merge, rebase, etc. #381
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently we sync changes to IRIS from a merge, rebase, etc. by running diff beforehand to find the modified items. This doesn't work well if a file was added to the local branch but not pushed to the remote branch - that add is treated as a delete by the diff, which causes the item to be deleted from IRIS.
For now, we are just ignoring deletions.
In the long term, instead of using "diff" to determine modified items we will need to look at the output of merge, rebase, etc. to determine when things are actually being deleted and added.