+ [2016-08-17T21:23:22Z] ericP ?
+ [2016-08-17T21:42:00Z] jhass ericP: here's the offender https://github.com/shexSpec/shex.js/commit/bf0d4f5545ece20b9e9bb2bec8fdd170c3d40b3e
+ [2016-08-17T21:42:30Z] jhass on https://github.com/ericprud?tab=activity you can see https://cloud.aeshna.de/u/mrzyx/screenshots/screenshot_20160817_234344.png
+ [2016-08-17T21:52:51Z] ericP jhass, it's that damned eric hacker. i'll kick his ass
+ [2016-08-17T21:53:50Z] ericP that particular commit appears to preceed the one that went to the wrong branch

message no. 147178

Posted by jhass in #github at 2016-08-17T21:42:00Z

ericP: here's the offender https://github.com/shexSpec/shex.js/commit/bf0d4f5545ece20b9e9bb2bec8fdd170c3d40b3e
+ [2016-08-18T01:29:38Z] WarriorX does git work on a file level?
+ [2016-08-18T01:30:09Z] WarriorX when you merge, if you have file_a on both branches (main and x_branch) the content get merged as well!
+ [2016-08-18T01:30:16Z] WarriorX what does that mean?
+ [2016-08-18T01:51:21Z] ckubrak Hi guys, if I have the commit ID (the short version), how can I see the difference between an old commit and the actual with out having to go through all those in between?
+ [2016-08-18T02:22:20Z] legind I'd like to create a custom octicon for PRs similar to Travis' checkmark, something that can run arbitrary code over a PR and generate one of several octicons to display. How would I go about doing this?