[Summary] Some commonly used Git commands

How to effectively review pull requests on GitHub? First of all, we must clarify the purpose of the PR, check the title, description and whether the task is related to it, and ensure that we understand the change intention. 1. Check for correctness, consistency, performance and security when reviewing the code and use inline comments to ask questions or suggestions. 2. Test the code locally if necessary, verify the function and find potential errors. 3. Decide to approve or require modification based on the review and test results, and communicate and feedback clearly. Following these steps improves code quality and facilitates collaboration.

gitcherry-pick is used to accurately apply a single commit. Applicable scenarios: quickly merge the bug fix of the feature branch into main, correct the commit movement of the wrong branch, and cross-version branch transplant hot fix; 2. The basic usage is gitcherry-pick, which will copy the changes of the commit and generate a new hash commit; 3. You can preview the changes through --no-commit, batch picking with A^..B, --ff to avoid repeated commits, and gitshow pre-checking content; 4. Pay attention to avoid abuse in shared branches, handle conflicts carefully, and do not pick and merge commits by default to prevent historical confusion. Use properly can improve efficiency and keep the commit history clean.

Switchtomainandlistmergedbrancheswithgitbranch--merged,thendeletethemexceptmainanddevelopusinggitbranch--merged|grep-v"main\\|develop"|xargsgitbranch-d.2.Deletestaleremotebrancheswithgitpushorigin--deleteandsynclocaltrackingwithgitfetch--pr

TooptimizelargeGitrepositories,startbyusingshallowclonesandsparsecheckoutstoreducedataload:1.Usegitclone--depth1forminimalhistoryandgitsparse-checkouttofetchonlyneededdirectories.2.Enablebuilt-inoptimizationslikecore.commitGraph,core.indexVersion4,co

Identifytheconflictusinggitstatusafterafailedmerge;2.OpentheconflictedfiletoseeGit’smarkersshowingthecompetingchanges;3.Editthefiletokeep,combine,orrewritethecontent,removingthemarkers;4.Stagetheresolvedfilewithgitadd;5.Completethemergewithgitcommit;

Useimperativemoodtomakemessagesconsistentandclear,e.g.,"Fixbug"insteadof"Fixedbug".2.Writeasubjectlineunder50charactersthatsummarizesthechangewithoutaperiod.3.Addabodywhenneededtoexplainthereasonforthechange,notjustwhatchanged,inc

Conflicts arise in teamwork should be resolved through effective communication, clearing problems, establishing common goals and formulating rules. First, we must face up to the existence of conflicts and actively discuss them to avoid burying hidden dangers; second, we must not rush to judge right or wrong, but listen to the positions and starting points of all parties, and solve problems with facts rather than emotions; second, establish common goals, such as evaluating design plans from the user's perspective and introducing a third-party perspective to assist decision-making; then, formulate clear rules, such as the division of labor of meeting roles, the use of collaborative tools, and regular review and adjustment mechanisms; finally, pay attention to emotional management to avoid escalating conflicts due to expression methods, and ask third parties to coordinate if necessary. As long as you face it in time and adopt reasonable methods, conflicts can be transformed into opportunities to promote team progress.

GitLFS solves the problem of large file storage, replaces large files with pointers, and store the actual contents in remote servers; 2. Install gitlfsinstall, use gitlfstrack "*. extension" to track file types and submit .gitattributes; 3. When cloning, you must run gitlfsinstall first, otherwise you can only get pointers and cannot use files; 4. Avoid tracking all files, forgetting to submit .gitattributes, and test whether to obtain the real file after cloning.