Version file updates for auto PR creation #7806
Merged
Conversation
This file contains 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
weshaggard
approved these changes
Jan 29, 2020
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.
When doing the work for the automatic PR creation, specifically when one PR with multiple commits when multiple libraries are released from the same pipeline run, there was an issue with the git merge. The problem occurs if two adjacent lines are changed git flags it as a merge conflict and is unable to rebase.
I'm probably going to end up changing the format of these files in the future (maybe XML instead of plain text which wouldn't have this issue only because of the formatting) but due to time constraints this is what I'm going with.