Today delete local branch git branch-d XXX hint: The branch xxx is not fully mergedCause: The XXX branch has no content merged into the current branchWORKAROUND: Use uppercase D to force removal of
About the remote branch-My understanding: The remote branch is always the latest version of the store.If the remote branch has been modified by someone else and its version is higher than the local version, you need to pull the remote branch down before merging and modifying
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
branchTo create a branch:git branch To switch branches:git checkout Create + switch Branches:git checkout -b Merge a branch to the current branch:git merge To delete a branch:git branch -d Resolve ConflictsLife is not as good as ten, and merging branches is often not smooth sailing.Prepare a new feature1 branch and co
When you clone from a remote repository, git actually automatically corresponds to the local branch master and the remote master branch, and the default name for the remote repository is origin .To view information for a remote library, use git remote :$
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
Tags: Android blog HTTP Io OS AR for SP File
Most of the online solutions are under the command line. I use egit, so I need to add the following sentence to the configuration file in eclipse (my version is Kepler.
Window-> preference-> Team-> Git-> Configuration-> repository settings-> select your repository and click Open
[Branch "master"]Remote = OriginMerge = refs/heads/Master
Second
Git: git branch -- set-upstream
When git creates a new branch locally and pushes it to the remote server, the following prompt will be reported if it is not processed again:
You asked me to pull without telling me which branch
First, the basic action
The branch in Git is actually just a checksum containing the object (40 character length SHA-1 string)
files, so creating and destroying a branch becomes very inexpensive.
How does Git know what branch you are currently working on? In fact, the ans
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
workspace (if the
* Include path
Overwrites the workspace file with a registers file, otherwise overwriting the registers and workspace files with the files in the specified commit.
* Do not use path
Detach the head pointer state, the commit in the detached head pointer state cannot be associated with the reference, and may be lost. The main function is to switch to the branch, if omitted branch equ
commit-a commit all changes to the current repos git add [file name] Add a file to git indexgit commit-v When you use the-v argument you can see the difference of commit git commit-M"This is the message describing the commit"Add commit information git commit-A-A is on behalf of Add, add all the change to
management:Git flow initialize the repository (using the default branch):650) this.width=650; "src=" http://s3.51cto.com/wyfs02/M00/59/56/wKioL1TQegviWK3FAAQyZ1ROBKU748.jpg "title=" 17.png "alt=" wkiol1tqegviwk3faaqyz1robku748.jpg "/> initialization completes to see the newly established branch name pushed to the server side:650) this.width=650; "src=" http://s3.51cto.com/wyfs02/M02/59/56/wKioL1TQei2STLM5A
:
git checkout-b release-1.2 Develop
After confirming that there are no problems, merge to the Master branch:
git checkout Master
git merge--no-ff release-1.2
# Make a label for the new node of the merge buildGit tag-a 1.2
Then merge to the develop
:
git checkout-b release-1.2 Develop
After confirming that there are no problems, merge to the Master branch:
git checkout Master
git merge--no-ff release-1.2
# Make a label for the new node of the merge buildGit tag-a 1.2
Then merge to the develop
Git branchGit branch takes no parameters: Lists the branches that already exist locally, and adds the "*" sign to the front of the current branch, for example:#git Branch* MasterNewbranchgit branch-r lists remote branches, for exa
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
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
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.