💾 Archived View for freeshell.de › tldr › git-merge.gmi captured on 2024-02-05 at 11:06:32. Gemini links have been rewritten to link to archived content

-=-=-=-=-=-=-

git merge

Merge branches.

More information.

Merge a branch into 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

Copyright © 2014—present the tldr-pages team and contributors.

This work is licensed under the Creative Commons Attribution 4.0 International License (CC-BY).

CC-BY