[Backport master] Bump c2cciutils #131
Merged
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
sbrunner
force-pushed
the
backport/935-to-master
branch
from
b597652
to
00b97c0
Compare
sbrunner
added
backport 3.10
backport 3.16
sbrunner
approved these changes
Apr 14, 2021
This was referenced Apr 14, 2021
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.
Backport of camptocamp/c2cwsgiutils#935
Error on cherry picking:
Error on backporting to branch master, error on cherry picking df72929ae72b33498b858a76cbc6bc279750ded9:
To continue do:
git fetch && git checkout backport/935-to-master && git reset --mixed HEAD^
rm BACKPORT_TODO
git apply --3way --index df72929ae72b33498b858a76cbc6bc279750ded9.patch
rm df72929ae72b33498b858a76cbc6bc279750ded9.patch
git commit --message="Bump c2cciutils"
git push origin backport/935-to-master --force