+ [2015-05-05T23:55:29Z] doubled but the owner said this: I think you need to merge master into your branch and resolve the conflicts
+ [2015-05-05T23:56:22Z] doubled locally I have everything up to date
+ [2015-05-05T23:59:16Z] doubled this is really akward
+ [2015-05-05T23:59:52Z] pcat doubled: maybe the "up to date" project has not finished merging?

message no. 92063

Posted by WereCatf in #github at 2015-05-05T05:35:10Z

I am trying to sync my fork with upstream as per https://help.github.com/articles/syncing-a-fork/ but it errors out with complaining about conflicts and I have no idea how to fix it. If I tell it to sync to upstream why can't it just do what I tell it to do?
+ [2015-05-06T00:00:09Z] pcat VxJasonxV: ?
+ [2015-05-06T00:00:10Z] doubled what do you mean?
+ [2015-05-06T00:01:32Z] doubled can I tell you what I did?
+ [2015-05-06T00:01:34Z] pcat doubled: meaning perhaps you pulled it during an incomplete state
+ [2015-05-06T00:02:18Z] doubled first, I created a branch and made some changes, pushed them to master (but not merging to master)