How to Compare Two Branches in Git?

In collaborative development, it’s often necessary to compare two branches in Git. Whether you’re reviewing code changes, troubleshooting differences, or preparing for a merge, comparing branches is essential to understanding the state of your codebase and ensuring a smooth development process.

This blog will walk you through the different ways to compare branches in Git, from simple CLI commands to visual tools, so you can efficiently track and manage differences in your project.

---

Why Compare Branches in Git?

Comparing branches can help you:

• Review Code Changes: Analyze differences between branches to ensure code quality and consistency.
• Prepare for Merges: Identify any conflicts or discrepancies before merging branches.
• Debug Issues: Check for specific changes that may have introduced bugs or regressions.
• Track Progress: Observe what changes have been made in a feature branch relative to the main branch.

Methods to Compare Two Branches in Git

Let’s explore the various methods for comparing branches, from using simple Git commands in the command line to leveraging visual tools for in-depth comparisons.

---

1. Comparing Branches Using Git Diff

The git diff command is a powerful and flexible way to compare branches directly in your terminal.

Comparing Branches for Code Differences

To compare two branches, use the following syntax:

git diff branch1..branch2

For example, if you want to compare the main branch with a feature branch:

git diff main..feature

This command shows line-by-line changes between main and feature. By default, Git displays changes in a unified diff format, highlighting added and removed lines.

Showing Only the Differences (Summary View)

If you only want a summary of files that differ between branches (without the actual code changes), use the --name-only flag:

git diff --name-only main..feature

This will list only the filenames that have changed, providing a quick overview of modified files.

---

2. Comparing Branch Commit History with Git Log

The git log command allows you to compare commit histories between branches. This is helpful if you’re more interested in tracking changes at a high level than in specific code differences.

Checking Commits in One Branch but Not the Other

To see commits that are in feature but not in main, use:

git log main..feature

This command displays a list of commits exclusive to the feature branch, showing what work has been done there that is not yet in main.

Finding Commits Exclusive to Each Branch

If you want to see commits unique to both branches (i.e., what’s different in both), you can use the --left-right flag:

git log --left-right main...feature

The left arrow (<) shows commits unique to the main branch, while the right arrow (>) shows commits unique to feature.

---

3. Comparing Branches with Git Merge Base

The git merge-base command is useful when you need to find the last common ancestor between two branches. This is helpful in identifying the base from which both branches started diverging.

Finding the Last Common Ancestor

git merge-base main feature

This command returns the commit hash of the last common ancestor between main and feature. Once you have this commit hash, you can use git diff to see changes from that base commit to each branch individually:

git diff <common-ancestor>..main
git diff <common-ancestor>..feature

---

4. Using GitHub or GitLab for Branch Comparison

For repositories hosted on GitHub or GitLab, you can use their online interfaces for branch comparison. These tools provide a visual representation of changes and make it easy to navigate through diffs and review commit history.

GitHub Branch Comparison

1. Navigate to your repository on GitHub.
2. Click on Pull requests and then New pull request.
3. Select the base and compare branches to see a side-by-side comparison.

GitHub provides a clear interface for viewing changed files, line-by-line differences, and commit history.

GitLab Branch Comparison

In GitLab, you can compare branches as follows:

1. Go to your repository in GitLab.
2. Navigate to Repository > Compare.
3. Choose the base branch and the target branch to view differences.

---

5. Using Visual Tools for Branch Comparison

If you prefer a graphical interface, several Git tools offer visual ways to compare branches, providing additional context and insights.

Using GitKraken

GitKraken is a popular Git client with an intuitive interface, allowing you to compare branches visually:

1. Open your repository in GitKraken.
2. Select the branches you want to compare, and GitKraken will show you a side-by-side diff, including commit history, file changes, and individual line differences.

Using SourceTree

SourceTree is another Git GUI that supports branch comparison:

1. Open your repository in SourceTree.
2. Select Log / History view, and select the branches to compare.
3. SourceTree highlights the differences between the branches, including modified files and commit logs.

---

6. Best Practices for Branch Comparison

• Compare Regularly: Reviewing changes frequently can help you avoid large merge conflicts.
• Use Meaningful Commit Messages: Commit messages can provide context, making it easier to understand the nature of each change during branch comparisons.
• Leverage Online Tools for Collaboration: GitHub and GitLab offer intuitive tools for code reviews, which streamline collaboration and improve the quality of the final code.
• Understand the Comparison Scope: Decide if you need to see only specific changes (e.g., code diffs, commit history) or a complete overview before selecting a comparison method.

---

Conclusion

Comparing branches in Git is a crucial part of the development process, allowing you to track changes, debug issues, and prepare for merges. Whether you’re using the command line for quick diffs or a GUI tool for a detailed view, understanding these methods will enable you to work more effectively and collaboratively in any Git-based project. By mastering these comparison techniques, you can keep your code organized, minimize conflicts, and ensure smooth integration of new features into the main codebase.