[[git command]] that merges changes from a given branch into the current branch. [^1] ^definition ```bash git merge <branch> ``` ^command Conflicts workflow: ```bash git merge --continue git merge --abort git merge --commit ``` ^conflicts-commands [^1]: https://git-scm.com/docs/git-merge#_how_to_resolve_conflicts