git merge

Also written: git merge --abort

Brings another branch's commits into the branch you're on. If it gets messy, `git merge --abort` puts everything back as it was.