Why I choose Git merge over Git rebase.

March 15, 2023 Adam Gardner

Both Git merge and Git rebase have their use cases and advantages. However, there are several reasons why I choose to use Git merge instead of Git rebase:

Maintains commit history: Git merge preserves the original branch history, creating a new commit that represents the point where two branches were merged. This can be helpful for understanding the history of the project and tracking down when specific changes were introduced.
Easier collaboration: Since Git merge maintains the original branch history, it is generally easier for multiple developers to collaborate on a project. Rebasing can cause confusion and conflicts if team members are working on the same branch simultaneously, as it modifies the commit history.
Safer for public branches: If you're working with public branches that other developers have cloned or are actively contributing to, it's recommended to use Git merge. Rebasing can lead to a more complex and challenging scenario, as it requires force pushing and may cause conflicts for other developers.
Simplicity: Git merge is more straightforward and easier to use for developers who are new to Git or those who prefer a simpler workflow. It doesn't require knowledge of advanced Git concepts or manipulation of commit history.
Resolving conflicts: Merge conflicts are more explicit with Git merge, as they are clearly indicated in the code. With Git rebase, conflicts can be harder to identify, as they appear during the rebasing process and may require more in-depth knowledge to resolve.

While Git merge has its advantages, it's essential to consider the specific needs of your project and team before deciding which method to use. Some developers prefer Git rebase for its cleaner commit history and ability to linearize changes, while others may choose Git merge for its simplicity and collaboration-friendly nature. Deleting Git history has never settled well with me so I will choose merge every day and all day as long as I can.

To perform a Git merge in terminal, follow these steps:

First, ensure that you are in the branch you want to merge into. You can check the current branch using the following command:

If you are not in the desired branch, switch to it using the git checkout command. For example, if you want to merge a feature branch into the main branch, make sure you are on the main branch:

Now, you can merge the branch you want to incorporate changes from. For example, if you have a branch named feature-branch, you can merge it into the current branch (main) with the following command:

This command will create a new merge commit in the main branch, which incorporates the changes from feature-branch.

Remember that merge conflicts may arise during the merge process. If this happens, you'll need to resolve the conflicts manually in the affected files, stage the resolved files, and then complete the merge by creating a new commit.