Page History

git checkout master # If you are not already in master.

git branch -D <branch_name> # Since the branch has commits that weren't merged,
							# GIT will complain if you try to delete the branch with -d
							# Thus, force it with -D

git pull origin master  # Fetch the latest changes from remote and merge them to your local repository.

git reset --hard origin/master # Reset back to origin.

git pull origin master # Fetch the latest changes from remote and merge them to your local repository.