keepalive: avoid diverging commits in forks #20
Conversation
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
In forks of `gitgitgadget-workflows`, we want to prefer merging the upstream branch over generating keepalive commits that diverge from upstream. To that end, run the workflow every week, and ensure that there is a commit at least every 4 weeks in forks, but every 3 weeks in the upstream repository. That way, the forks should always pick up the upstream's keepalive commit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
fix-keepalive-in-forks-again
branch
from
6f70cff to
b8d1227
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
In forks of
gitgitgadget-workflows, we want to prefer merging the upstream branch over generating keepalive commits that diverge from upstream.To that end, run the workflow every week, and ensure that there is a commit at least every 4 weeks in forks, but every 3 weeks in the upstream repository. That way, the forks should always pick up the upstream's keepalive commit.