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

This article mainly explains "git command how to merge branch code", interested friends may wish to take a look. The method introduced in this paper is simple, fast and practical. Let's let the editor take you to learn "git command how to merge branch code"!

For complex systems, we may have to open several branches to develop, so how to use git to merge branches?

Merge steps:

1. Enter the branch to be merged (if the development branch is merged into master, enter the master directory)

Git checkout mastergit pull

2. Check to see if all the branches are pull down.

Git branch-a # enter the command git branch-an on the command line to view all branches, here will enter log, exit ctrl + c does not work, just enter Q (or: Q)

3. Use merge to merge development branches

Git merge Branch name

4. View the status after the merger

Git status

5. If there is a conflict, resolve the conflict through IDE

6. After the conflict has been resolved, submit the conflict document to the temporary storage area

Git add conflict file

7. Results after submission of merge

If git commit# does not use git commit-m "comments", then git will automatically submit the results of the merge as comments to the local repository

8. The local warehouse code is submitted to the remote warehouse

Git push

The steps for git to merge branches into branches and master to branches are the same.

At this point, I believe you have a deeper understanding of "git commands how to merge branch code". You might as well do it in practice. Here is the website, more related content can enter the relevant channels to inquire, follow us, continue to learn!

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.