[[Git command]] that merges changes from a given branch into the current branch. ^definition ```bash git merge <branch> ``` ^command Conflicts workflow: ```bash git merge --continue git merge --abort git merge --commit ``` ^conflicts-commands