Understanding Non-Fast-Forward Merges in Git

Git merges are a fundamental part of collaborative development, but not all merges are created equal....