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.

Sign up for GitHub

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

Nit picking some Portuguese grammar #156

Open
wants to merge 1 commit into
base: gh-pages
Choose a base branch
from
Open

Nit picking some Portuguese grammar #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.pt_BR.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ <h2>atualizar &amp; mesclar</h2>
para fazer merge de um outro branch ao seu branch ativo (ex. master), use<br />
<code>git merge &lt;branch&gt;</code><br />
em ambos os casos o git tenta fazer o merge das altera&ccedil;&otilde;es automaticamente. Infelizmente, isto nem sempre &eacute; poss&iacute;vel e resulta em <i>conflitos</i>.
Voc&ecirc; &eacute; respons&aacute;vel por fazer o merge estes <i>conflitos</i>
Voc&ecirc; &eacute; respons&aacute;vel por fazer o merge destes <i>conflitos</i>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

manualmente editando os arquivos exibidos pelo git. Depois de alterar, voc&ecirc; precisa marc&aacute;-los como merged com<br />
<code>git add &lt;arquivo&gt;</code><br />
antes de fazer o merge das altera&ccedil;&otilde;es, voc&ecirc; pode tamb&eacute;m pr&eacute;-visualiz&aacute;-as usando<br />
Expand All @@ -174,7 +174,7 @@ <h2>rotulando</h2>
<div class="scrollblock block-checkout-replace">
<h2>sobrescrever altera&ccedil;&otilde;es locais</h2>
<p>
No caso de voc&ecirc; ter feito algo errado (que seguramente nunca acontece ;) ) voc&ecirc; pode sobrescrever as altera&ccedil;&otilde;es locais usando o commando<br />
No caso de voc&ecirc; ter feito algo errado (o que seguramente nunca acontece ;) ) voc&ecirc; pode sobrescrever as altera&ccedil;&otilde;es locais usando o commando<br />
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

<code>git checkout -- &lt;arquivo&gt;</code><br />
isto substitui as altera&ccedil;&otilde;es na sua &aacute;rvore de trabalho com o conte&uacute;do mais recente no HEAD. Altera&ccedil;&otilde;es j&aacute; adicionadas ao index, bem como novos arquivos ser&atilde;o mantidos.
</p>
Expand Down