0
The code of my local warehouse is exactly the same as the code of the remote warehouse
I want to update the branch node information of the local warehouse to the latest
How can there be a conflict when executing git rebase origin api_new?
1 answers
0
Git rebase is used to merge changes from one branch to the current branch. It is equivalent to your local branch being applied to the remote branch first, and then applying your local modifications to your local branch. If there is a conflict at this time, it means that the remote branch has been updated by someone else.
Hot tools Tags
Hot Questions
Popular tool
vc9-vc14 (32+64 bit) runtime library collection (link below)
Download the collection of runtime libraries required for phpStudy installation
VC9 32-bit
VC9 32-bit phpstudy integrated installation environment runtime library
PHP programmer toolbox full version
Programmer Toolbox v1.0 PHP Integrated Environment
VC11 32-bit
VC11 32-bit phpstudy integrated installation environment runtime library
SublimeText3 Chinese version
Chinese version, very easy to use
Hot Topics
20524
7
13634
4