-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
doc: improve onboarding instructions #59159
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
Conversation
- Explains Jenkins CI - Document how to make the PR appear as "merged" if landed manually - Explain what other repositories are for. - Mention reliability repo and CI flakes
Review requested:
|
onboarding.md
Outdated
* If you are landing the commit manually, to make it appear as "Merged" on GitHub, | ||
after you prepare the landed commit on the local `main` branch, run this: | ||
|
||
```bash | ||
git checkout your-pr-branch | ||
git reset --hard main # Synchronize your PR branch with the local main branch you just prepared. | ||
git push --force-with-lease your-fork-remote your-pr-branch # Update the PR branch in your fork. | ||
git checkout main | ||
git push upstream main # Push the landed commit to the upstream main branch. | ||
``` | ||
GitHub will automatically detect that the PR branch is now identical to the | ||
`main` branch and will mark the PR as "Merged". |
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.
Do we want to mention ./tools/actions/merge.sh
?
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.
hmm, shouldn't that be implemented in NCU so that there's no need to install gh separately?
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.
LGTM
Co-authored-by: Antoine du Hamel <[email protected]>
@joyeecheung ... just a heads up, given the approvals I'm going to mark this author ready and add the commit-queue label. |
It seems the commit queue is getting stuck for some reason. Re-applying the labels.. |
Landed in 0938211 |
Reapplying the label doesn't help, we do not use the labelled events. I don't think it was stuck, it was simply skipping the PR until it was open for 48 hours. |
- Explains Jenkins CI - Document how to make the PR appear as "merged" if landed manually - Explain what other repositories are for. - Mention reliability repo and CI flakes PR-URL: #59159 Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]> Reviewed-By: Ulises Gascón <[email protected]> Reviewed-By: Chemi Atlow <[email protected]> Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Uh oh!
There was an error while loading. Please reload this page.