search

muchirijane / learning-code-through-github-repos

This is a collection of GitHub repositories that you can use in your coding journey.
MIT License
129 stars 34 forks source link

Adding words for improve the translation #43

Closed MigueMartelo closed 4 years ago

MigueMartelo commented 4 years ago

🤔 This is a

✍ Description

Added to documentation

🐱‍💻 Use a meme/gif to describe how you feel for contributing (optional)

MigueMartelo commented 4 years ago

I can't find the conflicts, can you help me?

muchirijane commented 4 years ago

Hey, let me take a look at it.

MigueMartelo commented 4 years ago

Thank you, tell me anything you find.

MigueMartelo commented 4 years ago

@muchirijane do yo have anything about this PR? For solve. I'm waiting 😃

muchirijane commented 4 years ago

I have checked it out, You are the one who can solve it from your repo.

Step 1 git checkout -b MigueMartelo-feature/spanish-translation developer git pull https://github.com/MigueMartelo/learning-code-through-github-repos.git feature/spanish-translation

Step 2 git checkout developer git merge --no-ff MigueMartelo-feature/spanish-translation git push origin developer

I hope that helps. Let me know if it doesn't.

MigueMartelo commented 4 years ago

I don´t know what happen, I made that you tell me and is the same conflict, help me please.