solve them manually.
When you view hello, we will find that:
Git uses
The head points to the commit of the current branch terminal.
After =======,>>>>>>> is the code on another branch that you want to merge over.
The dev after >>>>>>> is the name of the branch.
For a simple merge, edit them manually, and then remove the tags, and finally add and commit as usual.
If the conflict is too complex, you need to use a graphical interface:Git mergetool
git log--graph: View branch merge diagram. 5, Br
local tags first: git tag-d ver0.5Remove remote tags: git push origin:refs/tags/ver0.5So the remote git server tag is deleted, below we go to the remote GIT server verification, such as:WYou can see that the remote git tag is actually deleted, hey. Well, here we have the management of the label is completed, let us su
Git Learning (vii) TAG management When you publish a version, you usually start with a tag in the repository, so that the only version that determines the time to tag is the one. Taking out a version of a tag is to take the historical version of that
Git tag management details
Outline:
I. Preface
Ii. Tag Overview
3. Create tags
Iv. Manage tags
V. Summary
Note: CentOS 5.5 x86_64, Git server version: git version 1.8.2.1, and Client version: git version 1.9.2.msysgit.0. Download all the software here: http://msysgit.github.io /.
I. Preface
In the previous article, we explained Git branch
merge submission, its commit ID is 6afec3b, and the command is typed:then use the command git tag to view the tags:Note that labels are not listed in chronological order, but are sorted alphabetically. You can use Git show as you can see, v0.9 does play on the Add merge submission. You can also create a label with a description, specify the label name with-A,-m to specify the description text:Use the command git show (SummaryCommand git
When we publish a version, we usually start with a tag (tag) in the repository, so that it is the only version that determines the time of the tag. Any time in the future, the version of a tag is taken out of the historical version of that tag. Therefore, the
What is a remote repository?
As described in chapter 1, remote warehouses can store all source code and resource files you have written.
It can even be used as a network disk, but of course there are many features that fit the GIT management text.
The following describes how to use GitHub as an example remote repository. (You can also create a server as a remote repository by yourself ).
Create a repository
On the homepage, find + new repository or t
Add link1. DescriptionIn the Finereport product demo, not only the report is displayed, but the addresses in the other links can be placed in the demo and accessed together.2. Add a linkSelect the Frtest directory, click the Add Link button, pop Up the Add Link dialog box, name input Baidu, link path input http://www.baidu.com, such as:Note: The link specific path must have http://Plus to be accessible.After determining, in the directory will generate a link to the record, the following link add
New label git tag default HEAD , or you can specify a commit IDeg. git tag v0.9git tag v1.0 31aa59cgit tag Git tag-s View Tagsgit tag View all tags git show see a tag messageDelete
Tag is also a snapshot of the repositoryPointer to a commit (the branch can be moved and the label cannot be moved)Switch to the branch that needs to be labeledgit tag $ git Tag v1.0git tag View all tags:$ git tagv1.0The commit of the previous commit requires the commit ID$ git tag
their own positions, so as to "not seek their own political position". How to effectively and efficiently use their own fragmented time, management of complex information fragments, coordination of a variety of tasks, is the recent self has been pondering the problem, as a technical staff but the management of a single clock (how to upgrade from the technical cattle to the
First, delete the local labelIf the label is wrong, you can delete it:git tag-d v0.1Because the created labels are stored only locally, they are not automatically pushed to the remote.Therefore, the wrong tag can be safely deleted locally.Second, push the labelIf you want to push a tag to a remote, use the command GIT push Origin git push Origin v1.0Or, all-in-on
Master is the main branch of the project, points to the project version, head is the latest version of the main branch of the project, pointing to the main line namegit checkout-b Dev//Create the Dev branch and switch to the branch, equivalent to:Git branch Dev//Create a branchgit checkout Dev//Switch BranchesGit branch//View Current Branchgit merge Dev//switch to the other, then merge the Dev branch into the current branchgit branch-d Dev//Remove Dev Branchgit log--graph--pretty=noline--abbrev-
e-commerce Web site with light opening Department (organization) management is a typical example of a tree menu application, and the effectBelow is a brief introduction to the implementation process1, Storage Department information XML file ( Light Open e-commerce website Base directory of base/dept.xml file )2. Manage the main frames page (e-commerce Web site with light openingthe base/index.html file in the base directory), 60 rows, the function is
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.