default, Git performs a fast-forward merge (Fast-farward merge) that points the master branch directly to the develop branch.With the--NO-FF parameter, a normal merge is performed and a new node is generated on the master branch. In order to ensure a clear version evolution, we would like to adopt this approach. For m
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
Why should there be branches, there are branches so that many people can be more efficient development. View branches, branch list
$ git Branch
* Master
administrator@young-pc MINGW64 ~/helloworld (Master)
There is only one branch, and then there is a * number in front of master, which represents the current
.
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
(1991-2002). By 2002, the entire project team began to enable the Distributed version control system BitKeeper to manage and maintain the code.By the year 2005, commercial companies developing BitKeeper ended up working with the Linux kernel open source community, and they withdrew the power to use BitKeeper for free. This forces the Linux open source community (especially Linux creator Linus Torvalds) to learn from the lesson that only developing a set of their own version control system will
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
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
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
time. After registration, try to add a new file to test whether git works well. The result is "Every up-to-date" displayed during the push operation. when checking the file, it is found that none of the files are actually updated. Because I am not familiar with git, I Have To Googling.
After searching, find the cause as follows:
Why does
今天我来介绍下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
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
Project background:The project was a flight reservation system developed by a Dutch customer in November 2011 using the ASP. The customer is mainly a travel agency business in China and Europe, especially in the last two years as a result of China's development so the customer also more and more attention to the airline ticket business so they and where to communicate and cooperation, and I division to complete and where the ticket business Connected business because I was responsible for the cl
Git Branch Management and conflict resolution original: Http://www.cnblogs.com/mengdd/p/3585038.htmlCreate a branchGit branchThere are no parameters to display all local branch names in the local repository.The current checkout branch is preceded by an asterisk.Git branch ne
Create a branchGit branchThere are no parameters to display all local branch names in the local repository.The current checkout branch is preceded by an asterisk.Git branch newnameCreates a new branch on the currently checked out branch
Create a branch Git branchThere are no parameters to display all local branch names in the local repository.The current checkout branch is preceded by an asterisk. Git branch newnameCreates a
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.