Git stash can be used to stage the current work, such as to pull the latest code, do not want to add a new commit, or another situation, in order to fix an urgent bug, first stash, so that return to their previous commit, change the bug after the stash pop, Continue the original work.Basic command:$git Stash$do some wo
git learning notes 05--git stash
An excerpt from the Git authoritative guide
Git stash is used to save and restore work progress.
Git stash
Saves the current work progress. The state of the staging area and workspace are saved separately.
git stash List
Displays a list of progress. This command clearly implies that
0. Introduction
The picture shown in the tutorial is a github warehouse image, please visit the original address of a friend with slow speed
Take a look at the personal tech Station when you're free.
In the actual project development, always encounter the code to write half (unable to hit commit ), to open a new branch to fix bugs or increase the functionality of the situation. If you do not, the unmodified code is brought into a new branch that is created temporarily, and th
Git temporary modification-git stash, git temporary-gitstash
Temporary modifications to track files (excluding untrack files, newly added files are still visible after stash, but newly added files cannot be restored through stash pop after being modified again after stash -- becauseThis command does not save files
In software development, bugs are like a routine, with bugs that need to be fixed, and in Git, because the branches are so powerful, each bug is repaired by a new branch, after the repair, the branch is merged, and then the temporary branch is deleted.When you receive a bug that fixes a code name of 119, it's natural to create a branch issue-119 to fix it, but the current work on Dev hasn't been submitted yet.[Email protected] Mingw32/c/gitskill (Dev)$ git statusOn Branch DevChanges to be commit
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 s
Please commit your changes or stash them before you merge, commitstashPreface
Recently, gitlab has been used for version control and collaborative work. It is not very familiar with the use of git, and git is only used in the git bash command line, summary of bugs encountered during git usage
Problem:
The following occurs when git pull is used:
Error: Your local changes to the following files wocould be overwritten by merge: xxx/xxx. java Please,
Label: Style Color sp c work r BS as app Purpose: when you are working on a project on a branch, you suddenly have to stop and do other things, but because the project has not been changed, you can keep the site without the need to commit it, wait until you are busy and then reply to the site for further modification. Bug handling stored at the development site$Git stash is currently "stored" at the work site, SoYou can create branches with confiden
already in use may be rejected, causing serious problems with the repository. If you do this, it's a good idea to log off once, for security reasons.MergeMerges the specified branch to the current branch:$ git Merge Branch-nameRevertRevert submitted changes (changes that have been submitted, can be undone ~)Revert the last-commit modification:$ git revert HEADTo revert the modification of the specified version:$ git revert Commit-idStashThe uncommitted changes are staged first, and then all cha
Label: git pop stash list clear
Git version 1.9.6
Git name Stash: helps developers temporarily hold the changes they have made, move them back to the status before the changes, and perform other necessary operations (such as solving a bug ), changes that were put on hold after the bug was fixed and re-loaded.
You can think of running the stash action as
This afternoon in the use of GIT command code management, because of their own negligence of the work of the day to lose the results of their own, this is also a terrible, scared the baby. Really, I believe that the code lost friends must be able to understand my mood, can not understand my mood that I wish you also lost code, so you can deeply appreciate my mood. Hey, then calm down for two seconds, mom eggs, can not be so recognized planted it, I do not want to write again that disgusting UI a
If the working area and staging area files are changed, save them, ignore these changes, and return to the last submitted state. You can use git stash.
Assume that there is a file T in the project and it is first deleted from git rm t. This file disappears in the working area.
Then execute the GIT stash command and check the working area again.
At this time, call the GIT
Stash sign in when prompted to enter a verification code, but the verification code does not show, how to solve it?Error message: 650) this.width=650; "src=" Http://s3.51cto.com/wyfs02/M01/72/85/wKiom1XlXJ_wyyq-AAFhGMLGC1I205.jpg "title=" Login error. png "alt=" wkiom1xlxj_wyyq-aafhgmlgc1i205.jpg "/>Check out the reasons for the specific error through Chrome's review element:
Error creating Bean with Name ' Imagecaptchaserviceprototype '
If some of the configuration files on the system have been modified on the server, and then the subsequent development adds some new configuration items,A code conflict occurs when this configuration file is published:Error:your local changes to the following files would is overwritten by merge:protected/config/main.phpPlease, commit your changes or stash them before you can merge.If you want to keep the changes made on the production server, just inc
Header file PStash.h/*** book: "thinkinginc++" * Function: pointer stash's header file * Date: October 5, 2014 14:33:15* Author: cutter_point*/#ifndef pstash_h_included# Define Pstash_h_includedclass pstash{ int quantity; The number of storage blocks for internally defined data types int next; The position of the next empty space void** storage; Point to a pointer to void* void inflate (int increase);//Increase memory space public: //Constructor Pstash (): quantity
with git, it will naturally come into contact with more commands like this.The concept of branching above must be understood, as this is the basis for understanding git pull and git push. As you can see, there's no git pull and git push involved in the previous tutorial, because we've been working on a warehouse repository and we're managing our own projects. When it comes to multi-person management, that is, when we want to manage someone else's project or the company's project, it involves so
?? original articles, reproduced please specify the Source: Server non-amateur research http://blog.csdn.net/erlib author Sunface Contact e-mail:[email protected] Although I have been working on server-side development for many years, but because of personal interests, for HTML5CSS3 attention to research for a long time, the following will add some of their own collection of dry goods:1.http://html5up.net/A very good foreign HTML5 template website, Sunface portrait recommended! 2.http://sc.china
Recently on the iphone project, the interaction is directly out of the keynote/ppt. It's faster than fw,keynote/ppt, and it's easy to generate prototypes that can be tested and displayed quickly by adding links and actions to them.Rapid Prototyping
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.