message no. 171904
Posted by dupondje in #github at 2019-04-22T21:39:03Z
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