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

[RDY] Update pt_BR translation #892

Closed
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
4 participants
@camponez
Copy link
Contributor

camponez commented Jun 25, 2014

I had another PR to this. After update my branch should should I create this another branch or should I continue with that old one? If so, how?

@philix

This comment has been minimized.

Copy link
Member

philix commented Jun 26, 2014

To rebase and update a PR you do:

git checkout master
git pull upstream master # update the master which should be always clean
git checkout update_pt_BR # go to yopur branch
git rebase master # and rebase (place the changes from master before your changes)
git push -f origin update_pt_BR # force push to your github repo to update the PR

If you still don't have the upstream remote, run git remote add upstream https://github.com/neovim/neovim.git

@philix philix referenced this pull request Jun 26, 2014

Closed

[RFC] Update pt_BR language #828

@camponez

This comment has been minimized.

Copy link
Contributor

camponez commented Jun 26, 2014

Thanks!

Actually I know how to rebase. I'm asking because I'm a bit confused. I did a sync commit, base on an old commit. Should I rebase anyway? The resync wouldn't loose its meaning?

@camponez

This comment has been minimized.

Copy link
Contributor

camponez commented Jun 26, 2014

If I do so. I only have to force push it? And it will update here?

@philix

This comment has been minimized.

Copy link
Member

philix commented Jun 26, 2014

If I do so. I only have to force push it? And it will update here?

Yeah, that's how github works: the PR is associated with the branch in your github repository.

@camponez

This comment has been minimized.

Copy link
Contributor

camponez commented Jun 26, 2014

Ok. Done.

Thanks.

@camponez

This comment has been minimized.

Copy link
Contributor

camponez commented Jun 26, 2014

@justinmk Done.

@justinmk

This comment has been minimized.

Copy link
Member

justinmk commented Jul 1, 2014

Did anyone review this? I know we have a few pt_BR speakers :)

@tarruda

This comment has been minimized.

Copy link
Member

tarruda commented Jul 1, 2014

There are 4,559 additions and 4,579 deletions. @camponez, perhaps you changed spacing/identation? if so then please avoid these kind of changes

@camponez

This comment has been minimized.

Copy link
Contributor

camponez commented Jul 1, 2014

@tarruda Not really. Take a quick look at it. My last commit (the other one is just a resync) has real modifications.

@philix

This comment has been minimized.

Copy link
Member

philix commented Jul 1, 2014

@justinmk I reviewed throughly and requested an incredible amount of
changes. @camponez made them and rebased.

__
Felipe O. Carvalho (philix)
http://felipe.rs
On Jul 1, 2014 10:23 AM, "Justin M. Keyes" notifications@github.com wrote:

Did anyone review this? I know we have a few pt_BR speakers :)


Reply to this email directly or view it on GitHub
#892 (comment).

justinmk added a commit that referenced this pull request Jul 1, 2014

@justinmk

This comment has been minimized.

Copy link
Member

justinmk commented Jul 1, 2014

Merged. Thank you @camponez @philix

@justinmk justinmk closed this Jul 1, 2014

@camponez camponez deleted the camponez:update_pt_BR branch Jul 1, 2014

dwb pushed a commit to dwb/neovim that referenced this pull request Feb 21, 2017

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