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
work is not finished, first put the work site Git stash, and then to fix the bug, repair, then git stash pop, back to the job site.
Store current working state: Git Stash
View a list of stored work states: Git stash list
Retrieve work Status:
1, git stash apply (remove the
the last two lines, which will be described in the following sections. Git provides many elegant and user-friendly options. If we combine the alias settings, we can use your imagination to make your own Git live.
Color: Is it painful to watch diff every time? So why don't we add color to our Git? You only need to add the three lines to display the red and green prompts on your console.
Git agility
Now let's talk about the usage and skills of the 'git log', 'git
Transferred from: HTTPS://GITHUB.COM/KAIYE/KAIYE.GITHUB.COM/ISSUES/7After mastering the basics of Git use, you may encounter some problems. The following are some of the problems that cat Brother screening summary, share to friends, master the points in these questions, Git advanced also completed, it contains the following sections:
How to modify Origin warehouse information
How to configure Git ssh keys
How to undo Changes
How to solve the conflict
Git
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:
Git stash Staging changesGit
Defect managementTools:1. bugzilla 2. bugfree 3. testdirector (Quality Center) 4. clearQuest 5. JIRA 6. mantis 7. bugzero 8. bugtracker 9. urtracker 10. kistracker 11. testlink 12, jtrac 13, bugnet 14, bugonline 15, etraxis
I. Bugzilla (free and cross-platform)Bugzilla is
BugThe tracing system is designed to help you manage
Software Development. Bugzilla is an open-source bug tracking system, which is specially developed for Unix. However, on Windows,
Today, when deploying the Jira system, the error is:
Java.lang.UnsupportedOperationException:Database is locked
cause Analysis: There are many reasons for this error, if you are installing a new database, then it is possible that the Entityengine.xml configuration error is caused, or your database needs to be repaired, which means that your database is out of the question.
Workaround:
You have to remove
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.