4
I have a following mobile project. A repository where code is shared between several projects. I’ll call this repository.
In the projects were created branchs of this base type because it was necessary to add a different sub-module for each project.
Ex. Project 1. Created the project branch 1 in the base repository and added the Sub1 submodule. Project 2. Created the project branch 2 in the base repository and added the sub2 submodule.
So... the difference between master and base branches is that branches have submodule. However, throughout the development, the project 1 branch has been modified and I need to send these modifications to the master and project branch.
Being in the master branch and running a git merge project1, it turns out that the project submodule 1 is included in the master, and this cannot happen, because the master is only to serve as the basis for the projects.
How to solve this?
I liked your solution Lucas. But I’m not going to do it. If it were, I would do it the way you suggested, but my colleague who is on this project is super lazy and will not want to create new branches because it makes testing difficult. Thank you
– Luciano Lima