Git · Concept
Merge conflict
git merge combines another branch with the current branch. It can move the branch pointer directly or create a merge commit, depending on the history and selected options.
Last updated
Syntax
git merge [<options>] [<commit>...]In-depth API docs are only for subscribers: parameters, examples, common mistakes and interview practice.
SubscribeRelated
git-pullgit-commitgit-fmt-merge-msgortrecursive--ff--no-ff--ff-only