+ [2019-04-22T19:43:54Z] dzho https://hubot.github.com/
+ [2019-04-22T21:38:08Z] dupondje Hi some minor question. I wanted to update a branch in my fork to upstream most recent master. But it went wrong it seems https://github.com/influxdata/telegraf/pull/4545
+ [2019-04-22T21:39:03Z] dupondje did add upstream, then fetch, merge upstream/master and then git rebase (had to resolve a merge conflict, did that, git add -A, and then --continue), but seems like something still went wrong
+ [2019-04-22T21:39:14Z] dupondje any idea's on how to (cleanly) resolve this?
+ [2019-04-22T21:56:28Z] kinase Hello, I have a question about using the github API via github.js. I would like to obtain a list of public repositories of a user (not my own). Could anyone help out?

message no. 171903

Posted by dupondje in #github at 2019-04-22T21:38:08Z

Hi some minor question. I wanted to update a branch in my fork to upstream most recent master. But it went wrong it seems https://github.com/influxdata/telegraf/pull/4545
+ [2019-04-23T18:53:04Z] dmlloyd dupondje: with that sequence of events, unless you kept careful track of what commits where added or changed, it's probably not possible to figure out what went wrong
+ [2019-04-23T18:53:32Z] dmlloyd you should reset to where you were in the fist place, and stick to either merging or rebasing, not both
+ [2019-04-23T22:06:42Z] CarlFK how do I do a PR of only one file?
+ [2019-04-24T13:34:25Z] nnielsen Hi! Anybody know how to create TOCs in Markdown on Gist? The examples in https://stackoverflow.com/questions/11948245/markdown-to-create-pages-and-table-of-contents won't work.
+ [2019-04-24T13:41:03Z] nnielsen Ie. https://gist.github.com/ae84/bc01090fddcc4f8f14bd843d93cd2039