git merge

Merge a branch into current branch

Branching

Syntax

git merge <branch>

Examples

git merge feature/login— merge feature/login
git merge --no-ff develop— merge --no-ff develop

Common flags & options

•--no-ff Always create merge commit
•--squash Squash into one commit

Related tools

Git Commit Formatter Git Commands Cheatsheet

Other Git commands

git init git clone git add git commit git push git pull git branch git checkout git rebase git reset git stash git log git diff git status git cherry-pick git tag git fetch git remote git bisect