Fix merge to main action #606
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
bolasim
approved these changes
Aug 24, 2023
| @@ -25,7 +25,7 @@ jobs: | |||
| - name: Merge release into main with priority on main changes | |||
| run: | | |||
| git checkout main | |||
| git merge --strategy-option=ours release -m "Merge release into main prioritizing main changes" | |||
| git merge --strategy-option=ours origin/release -m "Merge release into main prioritizing main changes" | |||
There was a problem hiding this comment.
can you please update this code to us actions/checkout@v3? All the other actions use that and It would be nice to keep it all consistent.
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.
Merging the
releasebranch seems to cause problems. We're fetching all branches before this step, so merging in origin/release is correct.Also updated the branch protection rules to allow basetenbot to push to main.