moves toward the new submission.When we create a new branch, such as Dev, Git creates a new pointer called Dev, points to the same commit as Master, and then points the head to dev, which indicates that the current branch is on D
branch , and head pointing to the current branch. At first, the master branch is a line, and Git uses master to point to the latest commit, and then head to master to determine the current branch and the commit point of the current branch:The Master
the meaning of the -- no-FF parameter of the previous command. By default, git runs fast-farward merge to direct the master branch to the develop branch.
After the -- no-FF parameter is used, the merge operation is executed normally and a new node is generated on the master branc
-1.2 Develop. /bump-version.sh 1.2 (this script is used to uniformly modify all versioning information in the code to 1.2) git commit-a-m "Bumped version number to 1.2" Git checkout mastergit merge -- no-FF release-1.2git tag-A 1.2git checkout developgit merge -- no-FF release-1.2git branch-D release-1.2"Hotfix branches" originated from "master" and is attributed
Since SVN was used all the time before and git was used in the wolf factory. Brother's Development Environment: intellij
Let's talk about the simple operation process.
1. Check out the GIT code library
CD to the specified directory
Git clone http: //.../Android. Git
Clone remote code to local
2.
objects:92, done.
Delta compression using up to 4 threads.
Compressing objects:100% (48/48), done.
Writing objects:100% (58/58), 1.38 MiB, done.
Total (delta), reused (Delta 5)
To Git@github.com:zrong/quick-cocos2d-x.git
* [New Branch] Develop-> develop
However, when I was working on the GitHub, I encountered this error while removing the remote
.
If you want to delete the dev branch input$ Git branch-D DevYou can. (If this branch is not merged, you want to discard it.Need to use$Git branch-D Dev)
When using the merge command, you can add the parameter-M "blabla", that
.
If you want to delete the dev branch input$ Git branch-D DevYou can. (If this branch is not merged, you want to discard it.Need to use$Git branch-D Dev)
When using the merge command, you can add the parameter-M "blabla", that
First, create the dev branch and switch to the dev branch.
$ git checkout -b dev
Git checkoutAdd the-B parameter to the command to create and switch, which is equivalent to the following two commands:
$ git branch dev
1. Purpose This article describes how to operate git branches, including creating and deleting branches, viewing and switching branches, merging branches, and merging conflicts.
All operations involved in this article are performed in the ubuntu14.04 environment, and the GIT version is 1.9.1.
2. Create and delete branches use the GIT
Use git 3 branch (study Note 3) branch gitbranchnew // create a new branch to directly merge (merge) gitcheckout-balternatemaster // directly create the alternate branch and go to the branch
Bug Branch
In software development, bugs are like the norm. With bugs that need to be fixed, in git, because branches are so powerful, each bug can be repaired by a new temporary branch, repaired, merged, and then removed by the temporary branch.When you receive a task to fix a bug with a code number of 101, it i
今天我来介绍下Git,Git是一款免费、开源的分布式版本控制系统。我们在上一个学习了Git分支冲突管理。这一章,我们要学习Git的Fast-forward模式、保存恢复现场 、测试的feature分支。Git in Mac simple and practical (1)-git basic commands (1)Git in Mac simple and Pra
#158 from Gwill/devel master #138 from Tdlrobin/master zrong Export Getfiledata remotes/origin/head- origin/master remotes/origin/add_build_script ' master ' into Add_build_script remotes/origin/devel export getfiledata To delete a remote branch:[Deleted] develTo rename a local branch:git
Git status Faq:when I issue the "Git status" command, I see the following "Your branch is ahead or origin/master ..." git Message# on Branch master# Your branch are ahead of ' Origin/master ' by 5 commits. #nothing to commits (wor
can do it quickly.First, we create the dev branch and then switch to the dev branch:$ git checkout-b devSwitched to a new branch ' Dev 'Equivalent to the following two commands:$git Branch
The GIT branching structure is just the tree and then merging.1. Switching of branches and Merging Git checkout-b new-branch-name: You can quickly build and switch to a new branch.git checkout branch-name: You can quickly switch
The introduction of git is not much said. Here is just a simple entry-level operation.How to install, initialize, and perform simple operations and branch operations.Everything is simple, not reasonable, but simple operations.Original article, if reproduced, please indicate the source: http://blog.csdn.net/yihui823/article/details/6673804I. Preparation 1. Installation
Under Ubuntu:
Sudo apt-Get install
emergency fix. We created an emergency patch branch hotfix to work until it was done (see Figure 3-13):$ git checkout -b ‘hotfix‘Switched to a new branch "hotfix"$ vim index.html$ git commit -a -m ‘fixed the broken email address‘[hotfix]: created 3a0874c: "fixed the broken
The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion;
products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the
content of the page makes you feel confusing, please write us an email, we will handle the problem
within 5 days after receiving your email.
If you find any instances of plagiarism from the community, please send an email to:
info-contact@alibabacloud.com
and provide relevant evidence. A staff member will contact you within 5 working days.