Environment: ubuntu16.04
Source: The above opened a branch for individuals, saying that the next time the code is updated, it will be directly pushed to the personal branch, and then apply for integration into the master to improve the efficiency of development.
Then there is the following summary of Xiaobai's knowledge of using the bitbucket branch version:
(1) In the workspace, git pull and git push are for personal branches (in the beginning, they are personal branches, if not individuals Branch, you have to switch back);
(2) When integrating a personal branch master, you need to do branchesit once in the actionsdrop-down bar in your own branch sync, and then pull request-createrequest to be integrated into the branch.
(3) The Behindnumber of updates that the branch indicated by the parameter lags behind the main branch; it aheadindicates how many times the branch is updated than the main branch.
(4) SyncThe purpose is to synchronize its own branch with the main branch first, and then integrate it into the main branch.
(1)-(4) are all operated on the web side.
Next time you adopt the method, before the terminal updates the branch, first go to the web page to 库-branches-behind/ahead-see behindif it is 0, if it is not, 0you need syncit-the terminal update git pull-更新内容-再上传自己分支--拉请求融入masterwill ensure that it will not cause simultaneous modification (the same file, different people have modified it). Conflict issues arise.
If masterthere is no update, then the syncbutton is yes 没有出现.
Switch branch operation:
git brachconfirm the branch where you are currently located, the colored star is the branch where you are, and the others are the names of all branches including master;
git chechoutsynchronize your current branch or master;
git merge xxxswitch to the target branch xxx.
The above are some personal records. If there is a mistake, I hope to leave a message below to correct it.
#################
Good memory is not as good as bad
writing'–20200824