Clarify which branches should be compared #19832
Merged
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
The description of coordinated merges in the Guide for Committers indicates that the tips of the master and openj9 branches in the openj9-omr repository should be compared to avoid promoting changes that have not passed an OMR Acceptance build. However, even if the tips of those branches are the same, it might be that the tip of the master branch in the omr repository does not match the tip of the master branch in the openj9-omr repository. Performing a coordinated merge in that circumstance would also promote changes that have not passed an OMR acceptance build. Added that case to the list of branches to compare. [skip ci] Signed-off-by: Henry Zongaro <[email protected]>
hzongaro
force-pushed
the
coordinated-merge-guidance
branch
from
b4e5986 to
9187aa2
Compare
|
@0xdaryl, may I ask you to review this change? |
0xdaryl
approved these changes
Jul 9, 2024
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.
The description of coordinated merges in the Guide for Committers indicates that the tips of the master and openj9 branches in the openj9-omr repository should be compared to avoid promoting changes that have not passed an OMR Acceptance build. However, even if the tips of those branches are the same, it might be that the tip of the master branch in the omr repository does not match the tip of the master branch in the openj9-omr repository. Performing a coordinated merge in that circumstance would also promote changes that have not passed an OMR acceptance build.
Added that case to the list of branches to compare.
[skip ci]