Force a Git Conflict

git pull --force
git merge -s
git force merge conflict
git merge conflict
git force merge commit
git force merge overwrite local changes
git force merge branch to master
git merge --no-commit