(sync) Resolve conflicts with gatsby-i18n-source @ 90932a0 #14
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
tesseralis
suggested changes
Feb 19, 2020
asantarissy
requested review from
3imed-jaberi,
asantarissy and
mhmdAljefri
as code owners
asantarissy
approved these changes
Mar 4, 2020
tesseralis
approved these changes
Mar 9, 2020
tesseralis
suggested changes
Mar 9, 2020
Thanks @tesseralis, yes and I added a new task in #1 for the partial translations. All conflicts are resolved now, should we merge this? |
|
@asantarissy My preference would be to re-translate the conflicts in this PR. If we merge this as-is, it would lead to pages with half-English, half-Arabic content, which can be jarring for readers. It's better to have an outdated version of a fully-translated file, in my opinion. If you feel like the changes are big enough that you'd like a separate PR for them, you can create a new branch off this one and create a PR against it. See the translation sync guide for more information. |
tesseralis
added
the
sync
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.
Sync conflicts with the source repo. Please update the translations based on updated source content.
For more information on how to resolve sync conflicts, check out the guide for syncing translations.
The following 7 files have conflicts:
Once all the commits have been fixed, mark this pull request as "Ready for review" and merge it in!
See all changes since the last sync here:
https://github.com/gatsbyjs/gatsby-i18n-source/compare/d1b72e5..90932a0
NOTE: Do NOT squash-merge this pull request. The sync script requires a ref to the source repo in order to work correctly.
Related PRs
#13 PR for syncing non-conflicting files