Repository navigation
docs: say that moving main-digdir marks the sync pull request merged - #3
Merged
Merged
Conversation
A synchronization lands by moving main-digdir to the sync branch, never through the pull request's merge button, which would replay the rebuilt queue onto the old main-digdir. GitHub then marks the pull request as merged by itself, so it must not be closed or merged by hand.
This file contains hidden or 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
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.
Summary
A synchronization lands by moving
main-digdirto the approved sync branch withgit push --force-with-lease. Step 6 ofMAINTAINING-digdir.mdnow also says:main-digdir.main-digdirpoints at the sync branch's head, GitHub marks the PR as merged by itself, so don't close or merge it.digdir/microsandbox#5 says the same in the Microsandbox runbook.
Evidence
Documentation only. The 0.7.8 synchronization landed this way: #1 shows as merged, without its merge button having been used.