gatsby-ja icon indicating copy to clipboard operation
gatsby-ja copied to clipboard

(sync) Resolve conflicts with gatsby-i18n-source @ 8ff6bb0

Open gatsbybot opened this issue 4 years ago • 0 comments

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 45 files have conflicts:
  • [ ] docs/tutorial/wordpress-image-tutorial.md
  • [ ] docs/tutorial/using-multiple-themes-together.md
  • [ ] docs/tutorial/using-a-theme.md
  • [ ] docs/tutorial/part-zero/index.md
  • [ ] docs/tutorial/part-two/index.md
  • [ ] docs/tutorial/part-seven/index.md
  • [ ] docs/tutorial/part-one/index.md
  • [ ] docs/tutorial/part-four/index.md
  • [ ] docs/tutorial/part-five/index.md
  • [ ] docs/tutorial/index.md
  • [ ] docs/tutorial/ecommerce-tutorial/index.md
  • [ ] docs/tutorial/authentication-tutorial.md
  • [ ] docs/docs/working-with-images-in-markdown.md
  • [ ] docs/docs/what-you-dont-need-plugins-for.md
  • [ ] docs/docs/what-is-a-plugin.md
  • [ ] docs/docs/using-client-side-only-packages.md
  • [ ] docs/docs/typography-js.md
  • [ ] docs/docs/themes/conventions.md
  • [ ] docs/docs/themes.md
  • [ ] docs/docs/sourcing-from-private-apis.md
  • [ ] docs/docs/sourcing-from-graphcms.md
  • [ ] docs/docs/sourcing-content-from-json-or-yaml.md
  • [ ] docs/docs/seo.md
  • [ ] docs/docs/recipes/working-with-themes.md
  • [ ] docs/docs/recipes/styling-css.md
  • [ ] docs/docs/recipes/sourcing-data.md
  • [ ] docs/docs/recipes/deploying-your-site.md
  • [ ] docs/docs/recipes.md
  • [ ] docs/docs/performance.md
  • [ ] docs/docs/mdx/getting-started.md
  • [ ] docs/docs/graphql.md
  • [ ] docs/docs/glossary.md
  • [ ] docs/docs/gatsby-image.md
  • [ ] docs/docs/gatsby-cli.md
  • [ ] docs/docs/eslint.md
  • [ ] docs/docs/environment-variables.md
  • [ ] docs/docs/deploying-to-firebase.md
  • [ ] docs/docs/deploying-to-aws-amplify.md
  • [ ] docs/docs/data-storage-redux.md
  • [ ] docs/docs/adding-comments.md
  • [ ] docs/contributing/translation/style-guide.md
  • [ ] docs/contributing/translation/index.md
  • [ ] docs/contributing/how-to-open-a-pull-request.md
  • [ ] docs/contributing/community.md
  • [ ] docs/contributing/blog-contributions.md

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/22a3fb4..8ff6bb0

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

#242 PR for syncing non-conflicting files

gatsbybot avatar Mar 28 '20 01:03 gatsbybot