Mastering Git: When to Use Merge vs Rebase in Real Projects

This is the final article in a hands‑on Git learning series, focusing on the most confusing topic: the difference between merge and rebase . A realistic scenario is presented where you have a remote master branch, you created a mywork branch, a teammate also pushed changes directly to master, and you need to incorporate the latest master changes into your work.

Merge workflow

Push your local mywork branch to the remote (create the remote branch if it does not exist).

Switch to master and pull the latest changes from the remote.

Switch back to mywork and pull the remote mywork branch (optional if you are sure it is up‑to‑date).

Merge master into mywork with git merge master, then push the updated mywork branch.

When the feature on mywork is finished, merge it into master using git merge mywork (fast‑forward if possible).

After the merge, the mywork branch shows an extra merge commit in the log. The merge command automatically creates a commit message like "Merge branch 'master' into mywork" , which you can edit if desired.

Rebase workflow

Pull the remote mywork branch.

Switch to master and pull the latest commits.

Switch back to mywork and rebase it onto master with git rebase master.

Push the rebased mywork branch; if the push is rejected, force‑push (e.g., git push --force).

When development on mywork is complete, rebase it onto the latest master again or merge later.

Rebasing produces a clean, linear history that looks like everyone worked on the same straight line, while repeated merges generate a more tangled log.

Basic principles for merge and rebase

Use git rebase when a downstream branch needs to incorporate upstream changes.

Use git merge when an upstream branch should integrate downstream work.

When pulling updates for the current branch, add the --rebase flag (e.g., git pull --rebase) to keep the history linear.

In practice, conflicts may arise during a rebase; Git will list the conflicted files, and after resolving them you continue with git rebase --continue. Avoid excessive conflicts by regularly rebasing or merging.

This article concludes the eight‑part Git hands‑on series, encouraging readers to practice the commands to solidify their understanding.