Shulou(Shulou.com)06/03 Report--

Editor to share with you about the Git code submission process and the example analysis of git commands, I believe that most people do not know much about it, so share this article for your reference, I hope you can learn a lot after reading this article, let's go to know it!

Basic understanding

The git command is a collection of command-line tools that can be used to track and record changes in files. For example, you can save, compare, analyze, merge and so on. This process is called version control. There are already a series of version control systems, such as SVN, Mercurial, Perforce, CVS, Bitkeepe and so on.

Git is distributed, which means it does not rely on a central server, and any machine can have a local version of the control system, which we call a repository. If there is a multi-person collaboration, you also need an online warehouse to synchronize information. That's what GitHub BitBucket does.

I have been using Git for some time, and as there are more and more projects, the number of functional branches increases, from simple basic commands to arbitrary, I need to constantly try to summarize. Here is a summary of my use of Git.

I. Git version branch management

The following is a more basic demonstration of branch management, each company's project management operation is different, branch management also has its own characteristics, but it remains the same.

1) the dev branch is used for daily development

2) when a new version needs to be released, merge the dev code into the release branch for integration testing and wait for the release

3) the release branch enters the bug repair phase

4) if bug is found in the release branch, modify it in the release branch and use git cherry-pick to merge the commit that fixes the bug into the release branch

(unlike merge, cherry-pick merges in units of commit rather than the entire branch.)

After completion, all code changes on the release branch (except the version number) should have been incorporated into the dev branch

5) after the release branch test is completed, publish to the online environment

6) and type tag and merge it into the master branch

7) if bug appears online, then hot fix repair on master

8) after hot fix appears and fixes, you need to re-merge the hot fix code into the dev and release branches to keep the code consistent

II. Exchange of basic Git orders

II. Summary of Git basic commands

1. View local file status

Git status-View the file modification status of local, local repository and cache (stash)

-Red represents file modifications in the local workspace

-Blue represents files submitted to the local warehouse (git add.)

two。 Switch version / overwrite the current modified file

Git branch-View the current version

Git branch-a view all versions

Git checkout XXX (version name)-switch to the XXX version in the remote library

Git checkout filepath-overwrite the currently modified file

Git checkout. -overwrite all current modified files

3. Get the latest code from a remote library

Git remote-View the remote library name

Git remote-v

Git remote show XXX (remote library name)

Git fetch-pull the latest code from the remote side

Git pull XXX (remote library name) XXX (branch name)-merges the latest pulled code with the current workspace

Git rebase-merge remotely pulled code with local code

4. Cache local code

When you want to switch to another version, you want to save the file modified in the current version: do it before switching

Git stash-caches files that have been modified locally and do not need to be submitted

Git checkout XXX (version)-switch the library version

Switch back to the original library and take the files out of the stash cache

Git stash pop-pull from the cache

5. Submit remote library

Git add.

Git commit-m''

Git remote View remote Association name

Name of the git push remote local master

6. Deal with conflicts

Git fetch pull the latest project

Git pull XXX (remote library name) XXX (branch name)-merges the latest pulled code with the current workspace

After the conflict occurs, go to the workspace and modify it. > New Code = = Old Code

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.