Somewhere along the way in trying to understand git I must have done something that I can't find a way to get out of or solve. Along with the commits I've made there's this 'Merge branch 'master'of [the repository site on my page]'. I thought I only made changes to the master, but apparently there's this other thing that GitHub wants me to do something with. What should I do? How do I solve this? GitHub message
1.4m articles
1.4m replys
5 comments
57.0k users