git resolves local conflicts
The process is very simple, mainly using the git stash command for processing, divided into the following steps to deal with.
1. Store local Modifications first
$ git stashThis allows all local modifications to be temporarily stored. is to use Git stash list to see the saved information:
1.git stash combing 1.1git stash cloning and synchronizationFirst, the logic of stash git is this.When a new change is made locally, when the current version is not present at the time of submission, it is necessary to pull the latest version of develop in your own code warehouse.In the Git stash setting if automatic synchronization is set, then the code warehous
From: http://blog.csdn.net/qinjienj/article/details/7475890
Developers often encounter this situation: it takes a few days to create a new function, and has changed more than a dozen files. Suddenly, a bug needs to be solved urgently, and then a build test group is given. Before the advent of git, manual backup was basically required, which was time-consuming and error-prone.
In short, the GIT stash comman
Concise git tutorial (single-user version) and git tutorial
Recently, I started to write a relatively large project, so I need to use git. I have been using SVN built with Kingsoft kubernetes and turtles. Recently I want to try git.
1. Install
Ubuntu:
1 sudo apt-get install git
Why use Git
Confucius once said, the name is a word shun shun the matter into.
Before we learn a new technology, figuring out why it's important to learn it, and why we want to learn about git, I use a if-else statement to tell you why:
if (you believe me) { I recommend you to study;} else if (admittedly, I am not a bull, you can not believe me, but you should believe in most people's choice)
Learn more about Mac-connected git operations for MacFirst on the service sideFirst: Create a new warehouse1, Cd/users/username/projectsUse the Linux command to enter a folder that you want to create to share with others.2,sudo git--bare initBuild a git repository.The "git init–bare" method creates a so-called bare rep
To create a certificate login:
Collects the public key of all users who need to log in, the public key is in the Id_rsa.pub file, and imports our public key into the/home/git/.ssh/authorized_keys file of the Linux server where the Git library resides, one line.
If you do not have the file, you create it and modify the permissions for the corresponding file:
$ cd/home/
The basic principles of git are described in the previous two-disk article, which is theoretical knowledge. In this article we go back to practice and look at the use of Git branching (branch).In the Code versioning tool, there is a branch concept. When we started building the repository, we had only one main branch (Master Branch), and it was not possible to put the concept of daily new functionality devel
Original:Http://gitbook.liuhui998.com/4_2.htmlfirst, the basicgit rebase is used to merge changes from one branch into the current branch. Suppose you now create a branch called "MyWork" based on the remote branch "origin". $ git Checkout-b mywork originAssumeremote Branch "origin"There have been 2 commits,Now let's make some changes in this branch and then generate two commits (commit).$ VI file.txt$ git c
ArticleDirectory
Version Branch
Start work
Preface
Do not use this article as a technical article for programmers. Even if you do not know anything about programming, you can follow the instructions in this article to learn how to do it. More importantly, this article will show you how to make git your job log, your backup tool, and your project management software. That's right. Git makes
Install and use Git (1). install and use git
I had nothing to do with writing a demo. I wanted to upload it to GitHub and found that I had to use git for upload. So I had to know about git first.
1. What is git?
Distributed version controller
2. Differences between svn and g
To improve the efficiency of git usage, more git graphical tools are used to operate git. (In special cases, git command lines are used to operate git.) If the graphical tool interface provided by git is not friendly enough, you c
CVS > SVN > GIT version Control History GIT: A free, open source distributed version control system . A. Create a git repository 1 . First register your account on the https://github.com platform 2 . Create a project; After successful landing, there is a "+" symbol next to the user name, click to create a new project; Enter the project name, here I enter
1. Mysysgit+gitblit installation process1.1 ResourcesNeed to download the good resources (the company's 1.6,1.7+ please match the corresponding mysysgit+gitblit):jdk1.6Git-1.8.4-preview20130916.exeGitblit-1.2.1.rar1.2 Installation1.2.1 Git Bash installation1) Double click on the pop-up installation page2) Click on 2 times Next, enter the path selection, add a custom path;3) Click Next to enter the selection component,4) Click the next step 2 times, se
Before reading this blog post, please follow my detailed instructions on the git diff command, only in order to have a detailed understanding of the git reset command;Let's see what git reset is.An important task of a version control system is to provide the ability to undo and redo a stage of work.The Git-reset comman
Git work structure, git StructureCreate a version Library
First select a directory (make sure that the directory name does not contain Chinese characters), and thengit bash, And then under this directory$ git initChange this directory to a git-managed repository (repository)
In this way,
Convenient for future reference. Thank the original blogger for sharing.
When we develop a project on more than one computer, we need to constantly modify the submission and update the latest remote code on another computer, see how to get updates from the remote code warehouse to the local, summed up the article on the Internet, using the following way is relatively simple.
Viewing remote branches
Use the following command to view the remote repository (I have a origin warehouse here)
Branch (branches) refers to the development of the main line of separation, do further development without affecting the original main line.Git does not store a series of change sets (changeset), but rather a series of snapshots. When you perform a commit, Git stores a Commit object that contains a pointer to a snapshot of what you currently need to commit.The function of the master branch in Git is the sam
You're free to collect some git commands from the Web, sort it out.1. Common git commands
Command
Brief Description
Special Notes
git add
Add to Staging Area
Git add–interactive
Interactive add
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.