message no. 173525
Posted by dmlloyd in #github at 2019-06-17T18:42:42Z
then you can either do: `git reset --hard origin/master` which will delete your local changes and replace them with upstream, `git rebase origin/master` which will rebase your changes on upstream, or otherwise merge them