Shulou(Shulou.com)06/02 Report--

Editor to share with you what is the difference between git rebase and merge, I hope you will gain something after reading this article, let's discuss it together!

Merge and rebase

The two commands on the title, merge and rebase, are used to merge branches.

The rebase command and the principle of the two commands are not explained here. Please refer to here for a detailed explanation.

The following content is mainly about the difference between the two in practice.

What is a branch?

The branch is to facilitate the collaborative development of multiple people in the same project. For example, each person develops different functions, does not affect each other in their own branch development process, and then submits them to the develop branch. The efficiency of development is greatly improved.

Merge branches

Everyone creates a branch for development, and when the development is complete and needs to be merged into the develop branch, the merge command is needed.

What is conflict?

When merging, conflicts may arise.

The conflict occurs because different branches change the same location when merging. So when merging, git doesn't know which one you want to keep, so ask questions (conflict reminders) and let you manually select what you want to retain to resolve the conflict.

The difference between merge and rebase

1. With merge and rebase, the difference between git log is that the merge command does not retain the commit of the branch of merge:

two。 How conflicts are handled:

Use the merge command to merge branches, resolve conflicts, and execute git add. And git commit-m'fix conflict'. A commit will be generated at this time.

(interactive) use the rebase command to merge branches, resolve conflicts, and execute git add. And git rebase-- continue, do not generate additional commit. The advantage of this is that, "clean", there is no meaningless resolution of the commit; disadvantages of the branch, and if there is more than one commit in the merged branch, multiple conflicts need to be handled repeatedly.

The difference between 3.git pull and git pull-- rebase: git pull does two operations: 'get' and merge. So adding rebase means merging branches in the way of rebase, and the default is merge.

After reading this article, I believe you have a certain understanding of "what's the difference between git rebase and merge". If you want to know more about it, you are welcome to follow the industry information channel. Thank you for reading!

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.