+ [2016-08-18T22:38:14Z] jhass LeBlaaanc: yes, but you don't even have to
+ [2016-08-18T22:38:30Z] jhass LeBlaaanc: just add the fork as a remote to your local repo, merge and push to your repo
+ [2016-08-18T22:39:19Z] jhass git remote add fork ...; git fetch fork ...; git merge fork/foo;

message no. 147196

Posted by WarriorX in #github at 2016-08-18T01:30:09Z

when you merge, if you have file_a on both branches (main and x_branch) the content get merged as well!
+ [2016-08-19T00:32:55Z] iio7 Why when I try to update my profile with a picture would I get this message: "Something went really wrong and we can’t process that picture."
+ [2016-08-19T00:33:12Z] iio7 This is a simple PNG 300x294 in size.
+ [2016-08-19T00:47:35Z] gh-status [Green] We are recovering from a brief network disruption. Webhook delivery was impacted from 00:18 UTC to 00:40 UTC.
+ [2016-08-19T02:47:04Z] theRealGent Does Github assign different #s to PRs and issues? So when I put #123 into a commit message somewhere, it will either reference an issue or PR and I won't have to clarify it?
+ [2016-08-19T03:33:24Z] Remram[m] Yes you can't have one of each use the same number