title: Is there a way to easily reverse the merging of the master branch to the feature branch in GIT and then do the opposite?
body: <p>I merged the master branch with the feature branch on my local repository, but when pushing to the remote repository I somehow merged the master branch into the feature branch. Instead, I needed to merge the feature branch into the master branch on the local repository.</p>
  <p>What steps do I need to take to ensure that I do so safely?</p>