request to change readme file#48
Conversation
entered some stuff tat can be useful
entered some stuff tat can be useful
vipulgupta2048
left a comment
vipulgupta2048
left a comment
There was a problem hiding this comment.
Great work reaching here @MohammadAfreed , 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 🐣
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
2 participants
added some comments