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

WeChat: GitShare

Weixin Official Accounts: Love to toss straw

If you have any questions or suggestions, please leave a message on the public account [1]

Git branch type 1, Master branch

A project's codebase should have one and only one main branch, and all official versions available to users are on this main branch, which we call the Master branch.

2. Develop branch

Development branch for daily use. This branch can be used to generate overnight versions of the code. If you want to release it officially after the development function test is completed, you can "merge" the Develop branch on the Master branch.

3. Temporary branches

In addition to the daily development setup branch, there is also a temporary branch to deal with some version development for specific purposes.

Feature branch: It is a branch from the Develop branch to develop a specific feature. After development, merge into the Develop branch. Name: feature-*

Pre-release branch: We may need to have a pre-release version to test before releasing to production. A pre-release branch is a branch from the Develop branch and must be merged into the Develop branch and Master branch after pre-release. Name: release-*

Bug fixing branch: After the software is officially released, some bugs appear, then you need to create a branch to fix bugs. Bug fixes branch is split off from Master branch, and after patching, merged into Develop and Master branches. Its naming convention: fixbug-*

Git branches using 1, develop branch (develop)

Git creates develop branch

The develop branch branches off from the master branch, and its commands:

git checkout -b develop master

Publish develop branch to master branch

#Switch to master branch

git checkout master

#Merge develop branches

git merge --no-ff develop

By default, Git Merge performs a "fast-forward merge," which points the master branch directly to the develop branch without creating new nodes.

To ensure clarity in version evolution, we generally use normal merging, i.e., using the--no-ff parameter, to generate a new node on the master branch.

2, Function branch (feature-*)

Git creates functional branches

The feature branch is a branch of the worm develop branch, and its command:

# x Version number, e.g. 1.1

git checkout -b feature-x develop

Merge the feature branch into the develop branch

After the development is complete, you need to merge the functional branch into the development branch, and its command:

git checkout develop

git merge no-ff feature-x

Delete functional branches

git branch -d feature-x

3. Pre-release branch (release-*)

Git creates pre-release branches

A pre-release branch is a branch from the develop branch that commands:

# x Version number, e.g. 1.1

git checkout -b release-x develop

Merge pre-release branches into master branches

After testing the pre-release branch without problems, it needs to be merged into the master branch with the command:

git checkout master

git merge --no-ff release-x

#Label the new node generated by the merge (label the version)

git tag -a x

Delete pre-release branches

git branch -d release-x

4. Bug fix branch (fixbug-*)

Git Create Bug Fix Branch

Bug fixes branch is a branch from the master branch with commands:

# x Version number, e.g. 1.1.1

git checkout -b fixbug-x master

Merge Bug Fix Branch into Master Branch

When bug fixes are complete, you need to merge them into the master branch, which commands:

git checkout master

git merge --no-ff fixbug-x

git tag x

Merge bug fix branch into develop branch

git checkout develop

git merge --no-ff fixbug-x

Remove Bug Fix Branch

git branch -d fixbug-x

summary

There are two ways to merge code in Git: git merge and git rebase. Why don't we talk about git rebase, because it's not often used.

The advantage of rebase is that the historical submission information of the project is very complete.

The disadvantages of rebase are security and traceability.

The golden rule of rebase: == Never use it on a public branch ==.

Photo Note: Love to toss straw

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.