fix: Configure git pull to rebase instead of merge #27
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
Use the new --show-current arg to branch in place of git rev-parse.
git push --tags already pushes both lightweight and annotated tags.
If the branch has not been updated while the action is running, then the pull will be a no-op either way, and the push will succeed. If the branch has been updated since the repository was initially checked out, then rebase rather than merge when pulling so that no merge commit will be created. If the rebase can not be performed non-interactively, then it will fail immediately, and there's nothing further that can be done. Configuring pull behavior has the added benefit of eliminating a twelve-line warning from Git about pulling without specifying how to reconcile divergent branches.
woile
approved these changes
May 10, 2022
|
@woile, I believe because this change was merged at the exact same minute as #32, it got left out of the 0.13.1 release. See the failed bump. |
|
You are right. I'm gonna merge your other pr tomorrow and then release to
the gh action marketplace.
Thanks a lot for the contributions
…On Tue, 10 May 2022, 20:32 Kurt von Laven, ***@***.***> wrote:
@woile <https://github.com/Woile>, I believe because this change was
merged at the exact same minute as #32
<#32>, it got
left out of the 0.13.1 release.
—
Reply to this email directly, view it on GitHub
<#27 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AATXJWFRH3ABR6EPNRIFAODVJKTS5ANCNFSM5VJR6EBQ>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
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.
If the branch has not been updated while the action is running, then the pull will be a no-op either way, and the push will succeed. If the branch has been updated since the repository was initially checked out, then rebase rather than merge when pulling so that no merge commit will be created. If the rebase can not be performed non-interactively, then it will fail immediately, and there's nothing further that can be done. Configuring pull behavior has the added benefit of eliminating a twelve-line warning from Git about pulling without specifying how to reconcile divergent branches.
Fixes #26.