Changes to README.md

[ghost]

I'm Lokesh Khurana, make some useful changes and added my name.

[vipulgupta2048]

Great work bruv @theluvvkhurana, but I won't be merging this. Since my expectations from you is much higher. Let me know if you like to learn more through #6 or I can create a conflict in your PR, and if you are able to solve it correctly. I will merge it. Seems fair, wanna learn more?

[ghost]

Yes, of course, I want to learn more from you and also interested to again be the part of Alias team.

…

On Fri, 18 Oct 2019 at 8:49 PM, Vipul Gupta ***@***.***> wrote: ***@***.**** approved this pull request. Great work bruv @theluvvkhurana <https://github.com/theluvvkhurana>, but I won't be merging this. Since my expectations from you is much higher. Let me know if you like to learn more through #6 <#6> or I can create a conflict in your PR, and if you are able to solve it correctly. I will merge it. Seems fair, wanna learn more? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#50?email_source=notifications&email_token=AIPKMFVBDXQBDYO4RT27UA3QPHHZZA5CNFSM4JBWJLHKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCIPBXRY#pullrequestreview-303963079>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIPKMFRYQGGCL4MA4ULLPOLQPHHZZANCNFSM4JBWJLHA> .

[vipulgupta2048]

Well, that's good enthusiasm. Here,

Great work reaching here @theluvvkhurana , let me get you started on what is a merge conflict, and how you can solve it. Remember to stay calm and take it slow. It's hard to bite down at first, but you will get it hatching_chick

Task - Resolve this conflict from your command line. After that, we will learn to switch branches

Steps for you to follow as a starter

On your command line, in the project folder vanilla do git pull upstream master, here you would see that one of the file in your computer (Local) conflicts with one of mine (Upstream)
You need to resolve this merge conflict.

Resources for you to learn more about resolving conflicts from the command line

http://kbroman.org/github_tutorial/pages/merge_conflicts.html
https://www.git-tower.com/learn/git/faq/solve-merge-conflicts
https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line

[ghost]

Okay, I'll do it.

…

On Fri, Oct 18, 2019 at 9:17 PM Vipul Gupta ***@***.***> wrote: Well, that's good enthusiasm. Here, Great work reaching here @theluvvkhurana <https://github.com/theluvvkhurana> , let me get you started on what is a merge conflict, and how you can solve it. Remember to stay calm and take it slow. It's hard to bite down at first, but you will get it hatching_chick Task - Resolve this conflict from your command line. After that, we will learn to switch branches Steps for you to follow as a starter On your command line, in the project folder vanilla do git pull upstream master, here you would see that one of the file in your computer (Local) conflicts with one of mine (Upstream) You need to resolve this merge conflict. Resources for you to learn more about resolving conflicts from the command line http://kbroman.org/github_tutorial/pages/merge_conflicts.html https://www.git-tower.com/learn/git/faq/solve-merge-conflicts https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#50?email_source=notifications&email_token=AIPKMFSHWLWVUS5KGTGURN3QPHLBVA5CNFSM4JBWJLHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEBU47II#issuecomment-543805345>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIPKMFSYAJJZKWTA3HZLOVDQPHLBVANCNFSM4JBWJLHA> .