> To keep it clean, you can > > git checkout master > git reset --hard origin/master > > and same for every branch containing a wrong merge. This will reset every branch to the state of remote, after that you can repeat the merge clean way.
Yes, but in this case, I'd already pushed.
