+ [2015-10-14T22:23:15Z] technicalpickles `git merge` only touches your local checkout. you'd need to `git push` to send it to github
+ [2015-10-14T22:23:17Z] archheretic so git push origin master ?
+ [2015-10-14T22:24:16Z] archheretic thanks for the help, that was indeed the last missing part :)

message no. 116073

Posted by BustyLoliChan in #github at 2015-10-14T05:36:47Z

I tried but the only op in the ruby channel is too busy being a dick and flipping out about my nick to actually be helpful
+ [2015-10-15T06:08:32Z] solatis ok, so, if I want to refer from a commit to an issue in a *parent* repo (as in, the repo i forked to fix the issue), i can just use #123 issue number, right ?
+ [2015-10-15T08:03:01Z] plsk Hi. I am having a merge conflict when I create a pull request in the Web UI, but not when doing it on the command line. Is this a known issue?
+ [2015-10-15T08:04:38Z] plsk The change is just a VERSION file, bumping it.
+ [2015-10-15T08:12:46Z] tobiasvl plsk: merge conflict when CREATING a pull request?
+ [2015-10-15T08:12:55Z] tobiasvl how do you create it on the command line? what tool do you use?