Skip to content

Conversation

@react-translations-bot
Copy link
Collaborator

This PR was automatically generated.

Merge changes from react.dev at b1a249d

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.

@vercel
Copy link

vercel bot commented Dec 30, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
pl-legacy-reactjs-org ⬜️ Ignored (Inspect) Visit Preview Mar 16, 2025 9:19am

@github-actions
Copy link

Size changes

Details

📦 Next.js Bundle Analysis for react-dev

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

@dawidsabat dawidsabat requested a review from jakubdrozdek March 16, 2025 09:56
@jakubdrozdek jakubdrozdek merged commit 4b8b7e3 into main Mar 16, 2025
5 checks passed
@jakubdrozdek jakubdrozdek deleted the sync-b1a249d5 branch March 16, 2025 10:34
@dawidsabat
Copy link
Collaborator

@jakubdrozdek, as a Collaborator, am I entitled to review, resolve conflicts in such sync PRs and merge them? Everything was fine with this one? Anything to improve or remember?

I am not that much familiar with Github flow so these might be silly questions 😄

@jakubdrozdek
Copy link
Member

jakubdrozdek commented Mar 16, 2025

@dawidsabat These PRs are created by the sync bot, to let us know that the original repo has been changed in one of the translated files.
You just need to resolve conflicts by translating the new words (by editing our translation), updating urls and paths in hrefs, etc.
The bot doesn't complain about files that were changed in their repo but never touched in ours - it merges them clearly, without conflicts.
Once you approve, make sure to merge this PR to our repo (never squash-merge, as explained in the PR description). Otherwise, the bot will complain about the same conflicts in the future.

@dawidsabat
Copy link
Collaborator

Ok, understood. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants