How to synchronize when the primary and sub warehouses are modified?

When the main warehouse switches branches , How will the sub warehouse be affected ？

Main warehouse switching , The sub warehouse remains unchanged .

This concept is very important , Many people don't understand what this constant means ？

for instance ：

set up ： The remote master Sub warehouse a edition id yes 111, The remote master Sub warehouse a edition id yes 222.

from master Switch to dev,master There are sub warehouses a edition id yes 111, Switch to dev after , Sub warehouse a edition id still 111, Local and remote are inconsistent .

How can local and remote become consistent ？

git submodule update

After using this command , Meeting Go to remote resynchronization dev Sub warehouse link under Branch
That is to say dev Branch sub warehouse a edition id become 222, Local and remote are consistent

When the main warehouse and sub warehouse are modified , How to synchronize to remote ？

difficulty ：dev Sub warehouse and master The sub warehouse version of is different , Direct consolidation will conflict .

Take advantage of the difference between local and remote , You can modify without rollback .

Earlier summary ： Normal development should have at least dev Branches and master Branch , You should be in dev Branch to develop , Then merge into master

Specific operation ：
First, in the dev： Enter the sub warehouse directory and submit your sub warehouse , All updates to dev Branch , namely add/commit/push Three piece set ( Of sub warehouse master It's the same thing , But first merge), Submit your main warehouse in the same way .

then ：
cd Return to the main warehouse , At this time, the main warehouse should be dev Branch ,
Switch to master Branch ,git submodule update At this time, the main warehouse and sub warehouse links are updated to master Of
here ,dev The link of branch sub warehouse is the same as master, Because switching branches will not cause link updates , therefore , You can use this gap , Update the main warehouse ,

next ：
git merge dev take dev Merge it , Since the sub warehouse links are consistent, there will be no conflict , After updating the main warehouse , You can modify sub warehouses at the same time ,
Enter the sub warehouse , Switch to master Branch ,（ The direct entry branch is the historical submission record ） Return to main warehouse , You can see that there are updates in the sub warehouse , At this point, you can submit to the remote .

As mentioned above , The main sub warehouse has been updated
We should continue the follow-up development. Pay attention
Git checkout dev
Git submodule update
to update dev Sub warehouse link of branch

present situation

First