-
Notifications
You must be signed in to change notification settings - Fork 129
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update lockfiles when PR is merged to a release branch #1950
Update lockfiles when PR is merged to a release branch #1950
Conversation
1d54f0a
to
ce34598
Compare
fc60c45
to
f8d5a43
Compare
Can you elaborate more in the PR description about what it does? Is it because the lockfile may not be in a correct state after merging some PRs? |
@meteorcloudy Sure! I just added more details. This will basically resolve the lockfile conflicts in the |
Oh, so this should happen before the PR is merged to the release branch, right? |
Theoretically, if a change is pushed to a release branch, it should have already passed the presubmit, which means the lockfiles are up-to-date? |
@meteorcloudy Yes, correct. But I'm referring to the other PR's (to the same branch) with lockfiles in it. Those will get conflicts with the lockfiles since there is a change to the lockfiles in the branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!!
This will resolve the lockfile conflicts in the
release-
branch PR's if the changes were to happen in arelease
branch.This is first triggered by any changes pushed to a
release
branch. And then once it finds out that there is conflicts with the lockfiles, then it will update the lockfiles and force push the changes. Only applies to the PR's from thebazel-io
account.