search

githubteacher / fluffy-octo-guacamole

demo and practice repo for May 2016 GitHub for Developers class
14 stars 15 forks source link

merge conflict preventing pull request #256

Closed johnnyxyz1223 closed 8 years ago

johnnyxyz1223 commented 8 years ago

having trouble getting merge request resolved

brianamarie commented 8 years ago

@johnnyxyz1223 Can you give me a little more information? Is it appearing on GitHub.com for your pull request, or have you tried to fix the merge conflict via command line?

johnnyxyz1223 commented 8 years ago

got it. Just having troubles stuck with only laptop screen. No 2nd monitor for bigger screen real estate. I had to use the command lines to get it to work

brianamarie commented 8 years ago

@johnnyxyz1223 Ah, I see. Thanks for letting me know! If you're using the command like to get it to work, sounds like you're a pro! 🎉

johnnyxyz1223 commented 8 years ago

@brianamarie thanks.