CONTRIBUTING: rebase master to staging without pinging people#166472
CONTRIBUTING: rebase master to staging without pinging people#166472Mic92 merged 2 commits intoNixOS:masterfrom
Conversation
Mic92
changed the title
|
cc @jonringer since this is based on #144227 (review) ;) |
Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de> Co-Authored-By: Janne Heß <janne@hess.ooo>
Artturin
left a comment
Artturin
left a comment
There was a problem hiding this comment.
i've been using this made by jonringer
# finding the common merge base will avoid pinging all CODEOWNERs
common=$(git merge-base origin/master origin/staging)
git rebase --onto=$common HEAD~1 # or however many commits you want to pull
git push --force
now i wont have to dig up my notes everytime hehe
ofborg
bot
added
10.rebuild-darwin: 0
| commits=$(git merge-base $(git branch --show-current) upstream/master) | ||
| # Rebase all commits onto the common base | ||
| git rebase --onto=$common $commits | ||
| # Force push your changes |
There was a problem hiding this comment.
| # Force push your changes | |
| # Force push your changes | |
| git fetch upstream staging | |
| git rebase upstream/staging |
There was a problem hiding this comment.
this shouldn't be necessary since they should have done git rebase --onto=$common $commits
There was a problem hiding this comment.
Rebasing onto upstream/staging should only be done after having force-pushed and switched the target branch in GitHub (see #166472 (comment)). (I may be misunderstanding your suggestion though)
There was a problem hiding this comment.
The merge base between master and staging is usually older than staging itself, and in between that diff there may be conflicting changes still.
There was a problem hiding this comment.
oh yea, that's fair. Keep forgetting about divergence :(
|
Feels like this could be solved in ofborg instead, at least for the most common cases? Just have a list of valid branch targets (master, staging, release-XX.YY), then pick the one with lowest distance to merge base for the pings. |
|
@K900 that's very much out of scope for this PR |
|
Oh yeah, definitely. Mostly just wanted to note down the idea because the current UX is... not great, even with this being documented. |
|
Updated to reflect reviewer feedback. PTAL. |
|
The fixup commit wasn't fixed up |
|
Simplified the instructions in #175352. |
10 participants
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes