[Backport 2.5] Fix: update-po doesn't use PGSCHEMA defined in .env file #7075
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/7039-to-2.5
branch
from
5fdd13e to
b10c5de
Compare
sbrunner
approved these changes
Oct 7, 2020
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 #7039
Error on cherry picking:
Error on backporting to branch 2.5, error on cherry picking ['698851006fb64b997fae2618e80b67b003d9c8a3']:
error: could not apply 6988510... Fix: update-po doesn't use PGSCHEMA defined in .env file
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'
To continue do:
git fetch && git checkout backport/7039-to-2.5 && git reset --hard HEAD^
git cherry-pick 6988510
git push origin backport/7039-to-2.5 --force