git merge

Join histories

medium risk

interactive breakdown — edit the command and press Explain
$ 
⚠ Risks & cautions
Safer / dry-run alternatives
git merge --no-commit --no-ff <branch>Merge without committing to inspect first
What it does

Integrates another branch into the current one.

Common flags
FlagMeaning
--no-ff --no-ffAlways create a merge commit
--abort --abortCancel an in-progress merge
--squash --squashSquash into one change
Examples
git merge --no-ff featureMerge with a merge commit · explain & risk-check →
git merge --abortCancel · explain & risk-check →
Related
git rebase git status
Open the full explainer →More in Git

Reference text is hand-written and may be incomplete — check man git for your version. Test destructive commands on a non-production system first.