My friend made a branch user
and while I was on my master
I did git pull origin user
and now that branch has been merged to my master.
I realised it only after many other changes and commits, but we decided not to implement that branch any more. How do I remove those files from my master
and make my local master the same as the Github one?
I tried git reflog
but I'm not sure what information I get there, many commits are being repeated. My git status
shows my branch is 6 commits ahead.