search

githubteacher / flaming-octo-meme

demo repo for today's Intermediate class
0 stars 5 forks source link

What if a pull request shows a merge conflict? #58

Open shwetasingh opened 9 years ago

shwetasingh commented 9 years ago

Is there an option to resolve it through GUI?

githubstudent commented 9 years ago

There is no option to do it through the GitHub GUI, you will need to use the command line. We will show you how to do that in a few moments!