Merge with merge commit

bash

git merge --no-ff feature/my-change

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Same sheet · prioritizing Merge, Rebase, and Commit Selection

Reuse recorded resolution for repeated conflicts.

Open In sheetbash1 tag match

Set default author name.

Create a new repository in the current directory.

Compact status listing.

Show local and remote-tracking branches.

Show local tags.