Revert "Revert "submitting-changes.chapter.md: explain *why* we have three branches"" #243140
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
…three branches"" This reverts commit 7e6c518. I misinterpreted Github's CI failure in the notification tab and thought that I had broken CI on origin/master, so I panic-reverted before I merged it (I thought they had). On closer inspection, it appears that the CI failure was not from the tip that I merged. This PR resubmits the reverted change. I'll wait for OfBorg to finish this time.
ghost
mentioned this pull request
ghost
marked this pull request as ready for review
This pull request was closed.
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 of changes
This reverts commit 7e6c518. See this comment.
I misinterpreted Github's CI failure in the notification tab and thought that I had broken CI on origin/master, so I panic-reverted before I merged it (I thought they had). Apparently lots of new checks (headings?) were added to CI for the manual during the three months that #225920 was sitting around.
On closer inspection, it appears that the CI failure was not from the tip that I merged. This PR resubmits the reverted change. I'll wait for OfBorg to finish this time.
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/)