[Backport 2.10.x] Update django-modeltranslation requirement #5270
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
Updates the requirements on [django-modeltranslation](https://github.com/deschler/django-modeltranslation) to permit the latest version. - [Release notes](https://github.com/deschler/django-modeltranslation/releases) - [Changelog](https://github.com/deschler/django-modeltranslation/blob/master/CHANGELOG.txt) - [Commits](deschler/django-modeltranslation@0.11...0.14.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
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.
Commits ["17357ae00727a48c150786e35a4909602e1d89fe"] could not be cherry-picked on top of 2.10.x
To backport manually, run these commands in your terminal:
Fetch latest updates from GitHub.
git fetch
Create new working tree.
git worktree add .worktrees/backport 2.10.x
Navigate to the new directory.
cd .worktrees/backport
Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 17357ae
Create a new branch with these backported commits.
git checkout -b backport-5266-to-2.10.x
Push it to GitHub.
git push --set-upstream origin backport-5266-to-2.10.x
Go back to the original working tree.
cd ../..
Delete the working tree.
git worktree remove .worktrees/backport
Then, create a pull request where the base branch is 2.10.x and the compare/head branch is backport-5266-to-2.10.x.