tldr/pages/common/git-merge.md

# git merge

> Merge branches.
> Homepage: <https://git-scm.com/docs/git-merge>.

- Merge a branch with your current branch:

`git merge {{branch_name}}`

- Edit the merge message:

`git merge -e {{branch_name}}`

- Merge a branch and create a merge commit:

`git merge --no-ff {{branch_name}}`

- Abort a merge in case of conflicts:

`git merge --abort`
Fix lint for common 2015-10-22 08:31:52 +01:00			`# git merge`
split git commands 2014-03-09 12:20:13 +00:00
Formatted all pages according to guidelines. 2016-01-07 17:31:27 +00:00			`> Merge branches.`
multiple pages: add homepages (#2660) 2019-01-30 11:19:23 +00:00			`> Homepage: <https://git-scm.com/docs/git-merge>.`
split git commands 2014-03-09 12:20:13 +00:00
Formatted all pages according to guidelines. 2016-01-07 17:31:27 +00:00			`- Merge a branch with your current branch:`
split git commands 2014-03-09 12:20:13 +00:00
fixup: token string style (#1081) - use underscore rather than minus - use lower case rather than uppder case 2016-09-21 16:35:46 +01:00			`git merge {{branch_name}}`
split git commands 2014-03-09 12:20:13 +00:00
Formatted all pages according to guidelines. 2016-01-07 17:31:27 +00:00			`- Edit the merge message:`
split git commands 2014-03-09 12:20:13 +00:00
fixup: token string style (#1081) - use underscore rather than minus - use lower case rather than uppder case 2016-09-21 16:35:46 +01:00			`git merge -e {{branch_name}}`
git-merge: add --no-ff example Include an example and brief description of the --no-ff option 2018-04-03 00:59:41 +01:00
			`- Merge a branch and create a merge commit:`

			`git merge --no-ff {{branch_name}}`
git-merge: add --abort 2018-07-18 22:05:38 +01:00
git-merge: --abort mentions that it's for situations with conflicts 2018-07-19 08:57:28 +01:00			`- Abort a merge in case of conflicts:`
git-merge: add --abort 2018-07-18 22:05:38 +01:00
			`git merge --abort`