git-merge

Join two or more development histories together

copy
0
0
git merge magic-barmerge the branch magic-bar into current branch

6 years, 10 months ago examplenow 1 | details |

copy
0
0
Merge two branches into the current onegit merge fixes enhancements Merge branches fixes and enhancements on top of the current branch, making an octopus merge

5 years, 6 months ago george 4 |

copy
0
0
merge branch into current branch using a merge strategygit merge -s ours obsoleteMerge branch obsolete into the current branch, using ours merge strategy

5 years, 6 months ago george 4 |

copy
0
0
merge the branch but do not commit itgit merge --no-commit maintMerge branch maint into the current branch, but do not make a new commit automatically

5 years, 6 months ago george 4 |