Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with reactjs.org @ 022c1b2f #114

Merged
merged 20 commits into from Feb 21, 2019

Conversation

Projects
None yet
@reactjs-translation-bot
Copy link
Contributor

reactjs-translation-bot commented Feb 20, 2019

This PR was automatically generated.

Merge changes from reactjs.org at 022c1b2

The following files have conflicts and may need new translations:

  • content/docs/hooks-intro.md
  • content/docs/higher-order-components.md
  • content/docs/addons-test-utils.md

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 master and cause them to show up as conflicts the next time we merge.

hnordt and others added some commits Oct 28, 2018

Merge pull request #1702 from nutboltu/master
Removed renderExamplePlaceholder as its never used
Merge pull request #1684 from linsolas/patch-1
Fix shallow renderer link on test utils page
Fix command for initializing tsconfig
Project dependency doesn't add itself it global PATH. So call `tsc` will work either with globally installed typescript, or from npm/yarn script.
Fix typo in blog
"collocation" instead of "colocation".
Merge pull request #1705 from vvscode/patch-1
Fix command for initializing tsconfig
@netlify

This comment has been minimized.

Copy link

netlify bot commented Feb 20, 2019

Deploy preview for pt-br-reactjs ready!

Built with commit 73e3c16

https://deploy-preview-114--pt-br-reactjs.netlify.com

tibuurcio added some commits Feb 21, 2019

Update higher-order-components.md
Changed captalization in headers and some minor tweaks

@tibuurcio tibuurcio added needs review and removed help wanted labels Feb 21, 2019

@tibuurcio tibuurcio requested a review from reactjs/reactjs-org-portuguese-brazil-translation Feb 21, 2019

@gmsecrieru
Copy link
Member

gmsecrieru left a comment

Lembre-se de não fazer sqush na hora do merge!

@tibuurcio

This comment has been minimized.

Copy link
Contributor

tibuurcio commented Feb 21, 2019

Hey @tesseralis, quick question. Is it better for us to "create a merge commit" or "rebase and merge" for those sync PR's?
I believe rebase would be better since it would maintain history in a better way, am I correct here? Is there a consensus on this? Thank you.

@fjoshuajr

This comment has been minimized.

Copy link
Contributor

fjoshuajr commented Feb 21, 2019

A gente costuma criar um commit de merge para essas atualizacoes.

Sempre que for necessario fazer o sync: Habilite o allow merge commits nos settings, faça merge do PR e depois desabilite. Deixando somente o squash merge activo.

@fjoshuajr fjoshuajr removed the needs review label Feb 21, 2019

@fjoshuajr fjoshuajr merged commit deb3aa1 into master Feb 21, 2019

1 check passed

deploy/netlify Deploy preview ready!
Details
@tibuurcio

This comment has been minimized.

Copy link
Contributor

tibuurcio commented Feb 21, 2019

Tá bom! Obrigado @fjoshuajr.

Mas porque desabilitar sempre? 🤔 Já que não devemos fazer squash merge faz mais sentido pra mim deixar essa opção desabilitada, ao invés do "merge commits". Ou então deixar os dois habilitados mesmo, pra não precisar ficar indo nos settings toda vez.

@fjoshuajr

This comment has been minimized.

Copy link
Contributor

fjoshuajr commented Feb 21, 2019

@tibuurcio, é que normalmente a gente só lida com merge de traducoes que tem varios 'commitizinhos' então o ideal é juntar todos esses em um só commit, usando o squash merge. Para a gente nao se confundir / enganar na hora do merge, só vai ter uma unica opcao possivel que é o squash. Agora de vez em quando surgem PRs de Sync (que a gente nao pode fazer squash), aí é que a gente usa/habilita o merge commit, mas o resto a gente faz squash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.