merge.md

All commands with "merge"

Merge two branches

To merge the history of the branch you are currently in with the branch_name.

git merge [branch_name]

Abort a conflicting merge

Throw a merge away and start over.

git merge --abort

Merge a remote repo with your local repo

Merge changes of the remote repository with local repo.

git merge origin/main