+[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]archhereticso git push origin master ? +[2015-10-14T22:23:21Z]technicalpicklesyes +[2015-10-14T22:24:16Z]archhereticthanks for the help, that was indeed the last missing part :) +[2015-10-14T22:24:31Z]technicalpicklesexcellent, glad I could help
do you know what the turn around time on a response is?
+[2015-10-15T06:08:32Z]solatisok, 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]plskHi. 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]plskThe change is just a VERSION file, bumping it. +[2015-10-15T08:12:46Z]tobiasvlplsk: merge conflict when CREATING a pull request? +[2015-10-15T08:12:55Z]tobiasvlhow do you create it on the command line? what tool do you use?