How to mention hot fix and cherry pick

Catalog

hot-fix

cherry-pick

Conflict handling

---

hot-fix

        What is it? ： Hot repair .

        Generally speaking, it's , When developing , Production environment prod What small problems need to be modified , We will mention hot-fix Solve .

        What do I do ： from pro Pull a temporary Branch , Then switch locally to the temporary Branch , Make changes , When it's over pro that will do .

        for instance ：

                1. In a remote warehouse pro Branch office , The new branch , It can be named hot-fix630

                2.  Switch to temporary Branch    git checkout -b origin/hot-fix630

                3. Make changes , then push To the far end

cherry-pick

        What is it? ： Picking up cherries

         Generally speaking, it's , When developing , From the last release to pro Already in dev Several new functions have been added to the environment , Submitted many times （ It is recommended that only one function be designed for each submission ）; Now we need to push one of these functions to the production environment pro.

         What do I do ： Select a few of them commit push to pro, If a submission involves multiple functions , The code of redundant functions should be commented or deleted .

        Be careful ： If multiple people develop the same page , In principle, you can't touch other people's code ！ If others are also involved in the submission of certain functions , It needs to be handled in person .

        If every time commit They are very standard （ Only a single function is involved ） Then you can use git command ：

//  Merge once commit; -x  It saves , If retained, the original submitter can be retained commit Information .
git cherry-pick -x <commit id> 

//  Merge many times commit;  Closed interval 
git cherry-pick <start-commit-id>^..<end-commit-id>

        If a submission involves multiple functions , You can only manually annotate or delete the code of redundant functions .

Conflict handling

        The above process , There is a good chance of conflict , Because the code you are currently submitting in team collaboration , May be related to the current pro The code is different somewhere above （ Last submitted by others ）, Your submission will conflict at this time , The solution process is as follows ：

//  See which files are in conflict 
git status  
//  Find the conflict , Manually modify    
vim xxx.jsx   
//  Add the file to the cache 
git add xxx.jsx
//  Submit  push
git commit -m 'fix:  Modify conflict '
git push

         If you start from dev Merge code into pro conflict , You need to switch to pro Branch pull At present dev Code for , Then resolve the conflict before push To the far end pro Environmental Science