git merge

				
					# Merge a branch into the current branch
git merge feature/login
# Example output:
# Updating abc1234..def5678
# Fast-forward
# 1 file changed, 10 insertions(+)

# Merge with a commit even if fast-forward is possible
git merge --no-ff feature/login
# Example output:
# Merge made by the 'recursive' strategy.
# 1 file changed, 10 insertions(+)

# Squash all commits from a branch into a single commit
git merge --squash feature/login
# Example output:
# Squash commit -- not yet committed.

# Abort a merge and restore the branch
git merge --abort
# Example output:
# (No output if successful; the branch is restored to its original state.)