latest 20 messages by github987

+ [2016-11-02T22:39:41Z] github987 random question: why is it that when i do a pull request on Github, i end up merging something into the master? i thought pulling was github to local?
+ [2016-11-02T22:24:41Z] github987 never mind i got it
+ [2016-11-02T21:56:34Z] github987 "remote repository contained commits unmerged into the local branch " -< how do i solve this? i tried fetching a fresh master from github, and merging into that, and pushing the new master, but that doesnt work
+ [2016-11-02T21:41:45Z] github987 remote repository contained commits unmerged into the local branch
+ [2016-11-02T21:40:58Z] github987 although i guess i might as well see what happens
+ [2016-11-02T21:40:41Z] github987 should i push the master though? i dont want to unilateraly change my master, as im trying to make this work with a friend of mine
+ [2016-11-02T21:39:15Z] github987 i mean, i thought the point of github was to have other people look at your changes, and then they can ok or not ok it
+ [2016-11-02T21:37:28Z] github987 why push without merging
+ [2016-11-02T21:37:14Z] github987 because github cannot merge
+ [2016-11-02T21:37:10Z] github987 well i cannot push my local branch
+ [2016-11-02T21:36:47Z] github987 now my local master is correct ( i think ) , but i dont want ti push it to github if that means the github master gets changed
+ [2016-11-02T21:36:04Z] github987 also i fixed my local merging issue, i kep merging a branch into itself or something
+ [2016-11-02T21:34:43Z] github987 would it make sense for me to merge my local master into my local branch, then push my local branch to github, and then merge/pull it into the master github branch there?
+ [2016-11-02T21:31:43Z] github987 what does it mean for a branch to start tracking another branch?
+ [2016-11-02T21:27:43Z] github987 i feel like the usage of HEAD does nothing but add to the confusion of all of this
+ [2016-11-02T21:27:19Z] github987 so if i merge a revision into head, should i merge my branch into head aka master, or merge master into head aka my branch?
+ [2016-11-02T21:24:12Z] github987 the tutorial i followed did not adequatly prepare me for this
+ [2016-11-02T21:23:40Z] github987 btw: what is head?
+ [2016-11-02T21:23:31Z] github987 it van merge revisions into "HEAD"