Merge 19.4.1 hotfix into 19.5 release branch #18188
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
As expected when merging the branch for the release currently in code freeze into an hotfix branch with the purpose of opening a PR to track the hotfix process into the latest release branch, we got conflicts in `config/Version.internal.xcconfig` and `config/Version.public.xcconfig` because both hotfix 19.4.1 and release 19.5 change the version compared to their common ancestor. I resolved the conflict, as usual, by keeping the value from 19.5 which is the latest.
Generated by 🚫 dangerJS |
AliSoftware
approved these changes
Mar 23, 2022
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.
As expected when merging the branch for the release currently in code freeze into an hotfix branch with the purpose of opening a PR to track the hotfix process into the latest release branch, we got conflicts in
config/Version.internal.xcconfigandconfig/Version.public.xcconfigbecause both hotfix 19.4.1 and release 19.5 change the version compared to their common ancestor.I resolved the conflict, as usual, by keeping the value from 19.5 which is the latest. To verify this, notice that there is not diff for either
Version.*.xcconfig.In fact, the diff is totally empty. This is because the hotfix comes from a PR that originally targeted 19.4, but was not merged in time. The value of this PR is merely to track the fact that an hotfix occurred in the Git history of our main branch.