Update nightly refresh workflow to avoid merge conflicts in version.txt #79
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
…liput, and generational-shenandoah to avoid merge conflicts.
|
What happens when there is no change in version.txt? |
No commit is made, and the branch merges continue. |
lutkerd
approved these changes
Oct 18, 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.
Description
Pulls updated
version.txtfile from thedevelopbranch intonightly,lilliput, andgenerational-shenandoahbranches before performing the merge.Motivation and context
This will circumvent a merge conflict on
version.txt.How has this been tested?
I ran this GitHub Action in my own forked repo, as well as testing the mechanism locally.