Mastering Git for Production: Branching, Merging & Squash Strategies Every Engineer Should Know

Source: Dev.to

Modern Software Development & Git Basics

Modern software development depends heavily on version‑control systems to manage code changes, support collaboration, and maintain stability. Git is the industry‑standard distributed version‑control system that enables teams to work concurrently without overwriting each other’s progress.

Core to Git’s power are its branching and history‑management capabilities—specifically branching, merging, squashing, and rebasing. Understanding these concepts is essential for maintaining a clean, traceable, and production‑ready codebase.

By the end of this article, engineers will understand how to:

1. Create branches to work safely
2. Merge branches using different strategies
3. Fix merge conflicts
4. Squash many commits into one
5. Push a complete project to GitHub

---

PROJECT SETUP – Part 1

---

FAST‑FORWARD MERGE – Part 2

---

3‑WAY MERGE (Parallel Work) – Part 3

13️⃣ Create Profile Feature

git checkout -b feature-profile
echo "Profile page created" > profile.txt
git add profile.txt
git commit -m "Add profile feature"

Creates an isolated development context for the profile feature.

14️⃣ Create Settings Feature

git checkout main
git checkout -b feature-settings
echo "Settings page created" > settings.txt
git add settings.txt
git commit -m "Add settings feature"

Now the codebase has diverged: two independent branches (feature‑profile and feature‑settings) each contain distinct commits.

15️⃣ Merge Profile into main

git checkout main
git merge feature-profile

Fast‑forward or regular merge (depending on history) integrates the profile work.

16️⃣ Merge Settings (3‑Way) into main

git checkout main
git merge feature-settings

Because main already contains changes from feature‑profile, Git creates a merge commit that reconciles the two histories.

Note: When the merge editor (Vim by default) opens, type your commit message, press Esc, then type :wq to write and quit.

---

MERGE CONFLICT – Part 4

17️⃣ Bug‑Fix Branch (updates README)

git checkout -b bugfix-title
echo "# Team Project Version 2" > README.md
git add README.md
git commit -m "Update title in bugfix"

18️⃣ Feature Branch (also updates README)

git checkout main
git checkout -b feature-title-update
echo "# Awesome Team Project" > README.md
git add README.md
git commit -m "Update title in feature"

19️⃣ Trigger Conflict

git checkout main
git merge bugfix-title
git merge feature-title-update

Git cannot automatically merge the two divergent changes to README.md and halts the operation.

20️⃣ Resolve Conflict

1. Open the conflicted file in Vim (or your editor of choice):

   vim README.md

2. Remove the conflict markers (>>>>>>>, <<<<<<<, =======) and keep the desired final content:

   # Awesome Team Project Version 2

3. Save & quit (:wq).

4. Stage the resolved file and commit the resolution:

   git add README.md
   git commit -m "Resolve merge conflict"

---

SQUASH MERGE – Part 5

21️⃣ Create Feature with Many Commits & Squash It

git checkout -b feature-dashboard

Now squash the three commits into a single, clean commit before merging back to main:

# Ensure you are on the feature branch
git checkout feature-dashboard

# Interactive rebase to squash the last three commits
git rebase -i HEAD~3

In the editor that opens:

1. Change the word pick to s (or squash) for the second and third lines.
2. Save & quit (:wq).

Git will combine the three commits into one. Edit the final commit message if desired, then save & quit again.

Merge the squashed feature back to main

git checkout main
git merge --no-ff feature-dashboard   # creates a merge commit even though fast‑forward is possible

---

Summary

You now have a complete, step‑by‑step guide for creating branches, merging (fast‑forward, 3‑way, and squash), handling conflicts, and preparing a project for push to a remote repository. Happy coding!

22. View History

git log --oneline --graph --all

This command lets you visually inspect and validate the type of merge performed, ensuring the resulting commit history aligns with the intended integration strategy.

---

PUSH TO GITHUB – PART 6

23. Create Repo on GitHub

A remote repository must be created and accessible before performing a push operation, as Git requires a valid remote endpoint to receive and store the local commits.

Do NOT check: Add README, Add .gitignore

24. Connect Local to GitHub

git remote add origin https://github.com/YOUR_USERNAME/git-merge-lab.git

This defines the remote endpoint, informing Git of the destination repository to which local commits and branches should be transmitted.

25. Push All Branches

git push -u origin --all

---

Closing Note

Branching, merging, and squashing form the backbone of efficient Git workflows.

• Branching enables safe experimentation.
• Merging integrates work.
• Squashing keeps history readable.

Mastering when and how to use each technique allows engineering teams to scale collaboration while maintaining a stable and maintainable codebase. In modern DevOps environments—where automation, rapid releases, and distributed teams are the norm—these practices are foundational to high‑quality software delivery.