GIT 向主要产品分支添加更改

Question

We have a product repo which refers to many submodules - say:

product->document
       ->examples
       ->code
etc

Now I have made changes to "code" repo. So my changes goes to "code" repo / develop and its build goes fine. Note that my changes however is yet to be merged in "code" repo develop branch

Now I am in need to build 'product' repo with my modified 'code' submodule such that I can check our changes in an environment - note only "product" repo creates product executable. The "product" repo refers to submodules develops branch. Hence until my code is delieverd to "code" develop branch I am unable to build a "product" build with my changes.

In other words the "product" repo needs to be build that points to the my "code" submodule.

I tried below way - checkout a "product" branch and tried to cherry-pick / merge changes in "code" repo to have my code repo changes:

user$ /c/product> git checkout -b feature/test_my_code_changes

user$ /c/product> (feature/test_my_code_changes)
$ git cherry-pick 44b591ca3266ad54d7c09c7dd55d2b65501a4077
fatal: bad object 44b591ca3266ad54d7c09c7dd55d2b65501a4077


user$ /c/product> (feature/test_my_code_changes)
$ git merge 44b591ca3266ad54d7c09c7dd5654323401a4077
merge: 44b591ca3266ad54d7c09c7dd5654323401a4077 - not something we can merge

The above command fails - I believe that cause the commit ids belongs to "code" submodule of my changes - how can I achieve the objective and verify that my "product" repo is refering or having my submodule / changes and then start a "product" build?

Answer 1

You could make the submodule code follows the branch used before merfing to develop in your product repository.

That way, a simple git submodule update --remote would be enough to force a pull of the develop branch in submodule code .