stash keychain

Benefit from this post: http://www.cocoachina.com/bbs/read.php? Tid = 96925 Thank you!Neutyz Cocoachina Symptom Certificate identity 'iphone developer: XXXX Ho (2j123456ha) 'appears more than once in the keychain. The codesign tool requires there only be one. Solution The reason is that there is an expired 'iphone distribution: xxxx' in keychain access, but it is not displayed in the key chain/login, but

, and we can see that they have been merged, however, fast forward merge cannot be seen as a merger. 15. Bug Branch1. If you are currently developing on the dev branch, there is a bug that needs to be quickly resolved and merged to the master. In this case, you can create a new branch on the master (Named bug-101 ).The content on dev cannot be submitted, so you need to store it through git stash. After storing it, you can view that the work zone is c

When you update your code with GIT pull, you encounter the following problem: Error:your local changes to the following files would is overwritten by merge: Please , commit Your changes or stash t Hem before you can merge. Aborting This problem occurs because others have modified the xxx.php and submitted to the Repository, and you have modified the xxx.php, you have a git pull operation is a good conflict, the solution, in the above

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

the last two commits, you need to run the following command.Git rebase-i head~2When you run the command, you'll see an interactive interface that lists a number of commits that let you choose which ones need to be compressed. Ideally, you choose the last commit and compress the other old commits.You will then be asked to enter the submission information for the new commit. This process essentially overrides your commit history.8.Stash UNCOMMITTED cha

in the workspace will become the non-developed Africa Zone feature before, it's so cool .Rollback is finished, small a in the thought if one day want to return to the version of the feature of the African zone what to do? Come on, you can't just look at the records and roll back through "git log" and go back to what you need to do:macbook-pro-4:p ondo jesi$ git reflog6c439d2 [email protected]{2}: Reset:moving to 6c439d2fd0d943f36f3ee84e158ff86b052961d20972f4b [Email protected]{3}: Commit: Afric

checkout-b myfeature origin/myfeature Save content in storage points, indexes and file systems 10. Storage In git you can put your current working state into a storage stack and then you can take it out again. The simplest scenario is the following: $ git Stash # do something else ... $ git stash pop Many people suggest usinggit stash apply来代替pop，不过如果这样做

First, use Git branch to create a branchUsage Scenario: No experience at the momentGit branch-a Show All branchesGit branch xx create XX branchgit checkout xx switch to XX branchGit checkout-b xx Create and switch to XX branchSecond, use Git stash save and restore work progressUsage scenario: Develop a new feature that has not been developed yet, but need to fix a bug urgently, you can save this progress, fix the bug to commit and then resume the work

=onelineWithout using fast forward mode, the principleBranching policy:In the actual development, we should follow several basic principles of branch Management:First of all, the master 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, the dev branch is unstable, at some point, such as the 1.0 release, then merge the Dev branch to master and release the 1.0 version in the Master branch;You and

information is discarded after the branch is deleted, that is, the merge cannot be seen once. Adding the--NO-FF parameter can prohibit the use of Fast forward mode, the merged history has branches, can be seen to have been merged.In the actual development, the master branch should be very stable, only to release the new version, usually do not work on it;The Dev branch is unstable, and at some point, the Dev branch is merged to master;Everyone works on the dev branch, and sometimes merges on th

The specific method is as followsGit pull Origin branch // error occurred git stash // Restore git stash ClearDevelopers often encounter this situation: It took a few days to do a new function, has changed almost more than 10 files, suddenly a bug needs to be resolved urgently, and then to a build test group. It's often time-consuming and error-prone to rely on manual backups before git comes out.The git

git logGit log-p: Show the differences for each commitGit log-p-X (x number of times, integer): Specifies the number of times the variance is displayedgit log--stat: Displays a brief count of incremental row countsgit log--author= cold Jiang: Show a commit record for an authorGit checkoutGit checkout--* * (file): Revert to file modificationGit checkout-b master remotes/master: Establish a local branch to the server and switch the pastgit branch-d: Delete local BranchGit branch-d: forcibly delete

) $ git commit-m "fixed" [Master 51e165e] FixedThe message tells us that the problem has been resolved. Then we can delete the Dev2 branch.$ git branch-d dev2deleted branch Dev2 (was 046661c).！ Note: Our previous split-to-merge operations are performed in quick mode, but when you delete a branch in this mode, the branch information is lost. Therefore, we can also adopt the No-ff method when merging the branches, as below, interested friends can test themselves.$ git nerge--no-ff-m "merge with No

Interactive_Rebasing.markdownNow we can see that the first 4 files have been staged, but the last one is not. Basically, this is a more compact way to view the state, and the actual information is consistent with the fact that we run ' git status ' on the command line:$ git statusVi. Storage 1. StorageWhen you are doing a complex job, you find a bug that is not relevant to your current job but is annoying. You want to fix the bug and do the work at hand, then you can use Git

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 everyone has their own branch, and it's time to me

the specified branch to the current branch, and discards the branch information after the branch is deleted.If a conflict occurs, Git uses to mark the contents of different branches. You need to modify and then run git commit . $ git merge--no-ff-m "Submission Instructions" It is recommended to use Normal mode to merge branches, the merged history has branches, can see that there has been a merger, and Fast forward merge can not be seen to have been merged. $

: Delete files in your working directory that are not versioned by gitStashed Branches　　StashGit stash (Gsta): Move all staging area files to the "storage area", similar to another type of work areaGit stash list: View storage queue (Stash lists)Git stash apply: Restore the most recent storage to staging area (you can

files: Git ls-files–deletedRecovery requires the new Checkout:git checkout–Simultaneous operation of multiple files can be done using XargsGit ls-fies-d | Xargs git Checkout--git checkout-f recover deleted filesIgnore committing certain files or folders1. Writing a file name or directory name within a. gitignore file ignores the commit, but only for files or directories that are not track-only, and is not valid for files that have been added to the version management.2. Files or directories tha

--hard head^ back to the previous version, and if you accidentally change the wrong code, fall back to the previous version and modify it again.Git reset--hard version number refers to the top 5 digits.Git checkout-the file name directly discards the workspace modification and does not do add,commit operation.Git rest headIf it is already commit, the version is rolled back directly.Branchgit checkout-b git chekout Git branch View all branches with * Description is the branch of the current opera

file, I set Co as the checkout alias. Next time I use 'git Co new_branch ', I can switch to the new_branch branch, which is concise and elegant; set CI to the alias of commit-a. The-A option indicates that I do not need to add the modified and deleted files to the index using the 'git add' command, in this way, when the command 'git ci-M "message" 'is used, the command 'git add files modified and deleted 'and 'git commit-M "message' are executed consecutively, saving our precious time; the cool