[Git merge code operation] B=>A

[Git merge code operation steps] B=>A

        Premise: I wrote the Git merge code A=>B before, and write B=>A again today, and the ride=》》》》》》》》》

        [Git Merging Code Operation Steps] A=>B

        Pull the latest code of B => then git merge A, if there is a conflict, resolve the conflict => commit  

 

 After I pulled the latest code, it became popular when it was merged. . .

 

The reason for the explosion is that someone submitted a new code later.

。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。

 

Then continue to pull the latest code

Then merge the new code into your local

The code of B is merged into A and then pushed to the A branch of the remote warehouse

Example: xj-pre => xj-dev  

git fetch  
git merge origin/xj-dev

 

git fetch is to pull remote to local cache

 

git merge origin/xj-dev remote xj-dev new code into local xj-dev

 check no error

......................

Check if the code has come

......................

here comes the code

......................

The tutorial is over.