git merge 1 January 2025 by Chris Taylor Updated: 01 January 2025 Merge our-branch but without fast forwarding git merge --no-ff our-branch