message no. 155598
Posted by github987 in #github at 2016-11-02T21:56:34Z
"remote repository contained commits unmerged into the local branch " -< how do i solve this? i tried fetching a fresh master from github, and merging into that, and pushing the new master, but that doesnt work