# delete
	git branch -d <branch>
# rename
	git branch -m <oldname> <newname>
or
	git branch -m <newname>

# force pull
	git fetch --all
	git reset --hard origin/master