+ [2017-06-30T15:48:56Z] minot you guys, what happens to a comment like this https://github.com/secretmessage/drupal3/commit/b1fae45a06de5cc660d020d0affbcc488343678a#commitcomment-22855808 is there a way to export everything out of github?
+ [2017-06-30T17:45:23Z] dtscode hey guys... is it possible to replicate github's front page (where you see all of the activity of the people/repos you follow) through the api?
+ [2017-06-30T20:46:37Z] rostero i have three branches: feature1, feature2, and feature1+feature2. we did a pull request for feature1 into feature1+feature2. github says "merged n commits into feature1+feature2 from feature1" then at the very bottom of the list of commits i see "merge branch feature1+feature2 into feature1". what would cause that? note there was a merge conflict at some point
+ [2017-06-30T20:47:01Z] rostero that was resolved within github
+ [2017-06-30T20:47:39Z] rostero and same thing happened when we did feature2 into feature1+feature2. at the bottom it says "merged feature1+feature2 into feature2"

message no. 169968

Posted by rostero in #github at 2017-06-30T20:47:39Z

and same thing happened when we did feature2 into feature1+feature2. at the bottom it says "merged feature1+feature2 into feature2"
+ [2017-07-01T05:18:58Z] j0bk Hello?
+ [2017-07-01T12:25:54Z] whaththef Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm <file>'
+ [2017-07-01T12:26:04Z] whaththef a mentally challenged individual has messed with my repository and now I can't do git pull origin master
+ [2017-07-01T12:26:46Z] whaththef is there a way to ignore whatever he has done and be able to pull again?