I have two branches, email and staging. staging is the latest one and I no longer need the old changes in email branch, y
email
staging
git checkout email git merge -m "Making email same as staging disregarding any conflicts from email in the process" -s recursive -X theirs staging