Skip to content

Conversation

@Beor18
Copy link
Contributor

@Beor18 Beor18 commented Dec 18, 2018

Hello community,

I bring you another contribution in the Spanish translation

Thank you very much and I hope for comments.

Best regards

@fhemberger
Copy link
Contributor

@Beor18 Hi, thanks for the update. Could you please rebase your changes from master and fix the merge conflicts?

/cc @nodejs/nodejs-es Please review.

@Beor18
Copy link
Contributor Author

Beor18 commented Dec 19, 2018

@Beor18 Hi, thanks for the update. Could you please rebase your changes from master and fix the merge conflicts?

/cc @nodejs/nodejs-es Please review.

Hello @fhemberger, have now if it's okay.
Excuse me as I am new contributing by there I can make some mistake and it's good to let me know jajaja

Best regards!

@ghost
Copy link

ghost commented Feb 3, 2019

@nodejs/nodejs-es:Sorry but it's been a long time, anyone free can have a review of that so as to merge it quickly :)

taggon and others added 2 commits February 3, 2019 17:59
This PR fixes some missing Korean translations in nodejs#1832.
Ref:nodejs/nodejs-ko#763
Because of the missing submission, we have to re-submit them together.

Ref 1: nodejs#2028,
Ref 2: nodejs#2026.
@edsadr edsadr self-assigned this Feb 5, 2019
SofiEstevez and others added 5 commits February 6, 2019 10:28
* Update node-meetups.md

* Update locale/en/get-involved/node-meetups.md

Thanks for reviewing, will update :)

Co-Authored-By: SofiEstevez <30813859+SofiEstevez@users.noreply.github.com>

* Corrected some formatting :)

* Update node-meetups.md

* Update node-meetups.md

* Update node-meetups.md

* Update locale/en/get-involved/node-meetups.md

Co-Authored-By: SofiEstevez <30813859+SofiEstevez@users.noreply.github.com>

* Update locale/en/get-involved/node-meetups.md

Sure, thank you for helping me formatting this!

Co-Authored-By: SofiEstevez <30813859+SofiEstevez@users.noreply.github.com>
Conflicts:
	locale/es/about/governance.md
@ghost
Copy link

ghost commented Feb 10, 2019

@Beor18:Hi,

Since your changes should be limited to 'about/governance', so for other changes you don't need to submit. You can only submit what changes you have :)

Suggestions:

  1. Save your changes into 'Stash' first.
  2. You can just use git pull --rebase origin master to update your own master branch when it's checked out.
  3. Solve all kinds of conflicts...ect.
  4. Apply the changes from your Slash of Git into the current master, and make a force push.

Hope this helps!

@ghost ghost merged commit f63e81b into nodejs:master Feb 14, 2019
@ghost
Copy link

ghost commented Feb 14, 2019

@Beor18:Thank you!

This pull request was closed.
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.

8 participants