merging-feature-branches-to-main

Squash merge combines multiple commits from your feature branch into a single clean commit on main. Use `git merge --squash` to consolidate your branch history, then create one commit message that summarizes the entire feature before pushing to main.

Squash merging keeps your main branch history clean and readable by eliminating granular development commits. It's particularly useful in TDD workflows where many small test-driven commits are common, resulting in a single, meaningful feature-level commit.

After squash merging, craft a clear commit message summarizing the feature, then safely delete the feature branch locally and remotely. Finally, push your updates to main to complete the integration.

Yes, squash merge is designed specifically for TDD workflows. It consolidates the many small test and implementation commits typical in TDD into a single clean commit, keeping main branch history organized and maintainable.

Ensure your feature branch is up to date, your working directory is clean with no uncommitted changes, and you have permission to merge into main. Your branch should be fully reviewed and ready for integration into the main codebase.