changes from one branch on another: git-merge (1) and git-cherry-pick (1). Merges ... git-push (1), git-pull (1), git-merge (1), git-rebase (1), git-format-patchstatus. • MERGE_HEAD is written by git-merge (1) when resolving merge conflicts. It containsgit-restore (1) to undo changes. • git-merge (1) to merge between local branches. • git