merged locally changes and differences among previous branches#22
Open
merged locally changes and differences among previous branches#22
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
1 participant
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.
As you can see, it looks like it is many commits behind, but all of them were merged locally, because there were issues in the versioning (as we previously discussed offline). So for the conflicts to be resolved you can consider the files in this branch as the one where we already tackled (and very likely resolved) these conflicts
I tested the pipeline (through worldsar) on S1 and it is working correctly for both the alignment and the different decomposition/corrections and so on