{"body":"Hi all - basic question that is frustrating me. My master and origin master have diverged, and now it's causing me issues. I would like them to sync up. I have tried fetching, but still there is a divergence: \n\nSwitched to branch 'master'\nYour branch is ahead of 'origin/master' by 33 commits.\n\nI'm sure this is basic.. does anyone have the solution?","name":"Your branch is ahead of 'origin/master' by 33 commits.","extension":"txt","url":"https://www.irccloud.com/pastebin/WKJaMA4L/Your+branch+is+ahead+of+%27origin%2Fmaster%27+by+33+commits.","modified":1512595047,"id":"WKJaMA4L","size":350,"lines":6,"own_paste":false,"theme":"","date":1512595047}