git stash

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

completed in 1 days. However, the bug must be fixed within two hours, what should I do?Fortunately, Git also provides a stash feature that can "store" the current work site, and then continue to work after resuming the site:$ git stashNow, using GIT status to view the workspace is clean (unless you have a file that is

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 is natural that you want to create a branch issue-101 to fix it, but, and so on, the work that is currently in dev progress has not yet

所有分支　　$git merge dev //将dev分支的工作合并到当前分支　　$git branch -d dev //删除dev分支　　$git log --graph --pretty=oneline --abbrev-commit //查看分支合并图　　$git merge --no-ff -m "merge with no-ff" dev //以禁用Faste forword方式合并分支，合并完之后可以在历史中查看到曾经做过合并，而使用Faste forword方式则不会在历史记录中显示　　$git

Renaming Git pull Pull back the commit of the remote repository git push Push to remote repository Git rebase Branching variable Base Git reflog Branch and other reference change records management

to be disabled, Fast forward git will generate a new commit at merge, so that branching information can be seen from the branch history git merge --no-ff -m "merge with with no-ff" devPrepare to merge the Dev branch, note that the --no-ff parameter means disable Fast forward, because this merge creates a new commit, so with the-m parameter, write the commit description in Bug BranchGit also p

, whenever necessary, you can use the command GIT push Origin master to push the latest changes;Remote Library cloningTo clone a warehouse, you must first know the address of the warehouse and then clone it using the git clone command.GIT supports multiple protocols, including HTTPS, but the native GIT protocol supported by SSH is the fastest.View branches:

modification and creates the remote branch Devgit push Origin Zyf-dev the current branch Zyf-dev Push to remote (the remote repository does not give the branch a new branch is created)--Hidden files1 git stash hide the current job and wait to resume the scene after resuming the live 2 git stash list view all h

transformation Git reflog Branch and other reference change records management Git remote Remote repository Management Git repo-config* Synonyms, equivalent to git config git reset Reset Change Bran

Related articles:For a way to verify that an SSH configuration exists and generate an SSH key, refer to the article: Git usage manual: Generate SSH key for SSH key usage and public key in GitHub, Gitlab configuration, please refer to article: Git usage manual: Use SSH key and configure SSH Key public key on the concepts and relationships of Git workspaces, regist

use of branchinggit branch Git checkout-b Branching policy : First of all, themaster branch should be very stable, that is, only to release the new version, usually do not work on it; So where do you work? Work on the Dev Branch, that is, thedev branch is unstable, at some point, such as the 1.0 release, then merge the Dev branch to Master , in the master Branch Release version 1.0; You and your little friends each work on the Dev Branch, and every

b42294309188d57bf3398ed35660170a237d8c0aNote that the long string behind this is the SHA1 code for each commit.3. Switch to a branchgit checkout Testing4. Graphical display of branch informationGitkGITK--all5. MergeFirst, go to the branch you want to merge into, such asgit checkout MasterThe general will merge to master.and then callGit merge TestingThis will merge the changes on the testing branch.6. Delete BranchAll right, this branch, cut it out.git branch-d Testing7. Handling ConflictDuring