latest 2 messages by WereCatf

+ [2015-05-05T05:49:40Z] WereCatf No one here knows how to force a sync with upstream?
+ [2015-05-05T05:35:10Z] WereCatf 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?