Replace local merge changes

Question

master → completely messed up, my first time using gitmergetool

backup → works great.

How can I combine backupwith master and make it a backuppriority for everything, including files that exist in master, but not in backup, that will be deleted.

I started the gun git reset --hard <hash where everything was peachy>and returned the project before trying to drain. So how do I go about merging? I don’t know where the conflict came from. I had to devote myself to the owner, but I do not remember this.

I thought it would be easier to delete masterand then rename backupto master, or checkout -b mastershould I try to merge?

Answer 1

, , , , - , .. :

git checkout backup
git reset --hard <hash where everything was peachy>
git checkout master    
git merge -s recursive -Xtheirs backup

Answer 2

master backup, master.

git branch -D master
git branch -m backup master

Answer 3

Just point the wizard to the same place as the backup:

git checkout master
git reset --hard backup