Hello, We have a super project which includes ~100 repositories added as a submodule. The super project tracks these submodules using a commit. We have issues in identifying an automatic merge mechanism across branches in the super project.
Below is the use case. 1. We have created feature/XYZ branch in the super project from the latest master. 2. We have created the same feature branch feature/XYZ in 30 submodule repos (out of 100, where we expect the changes corresponding to the new feature). 3. We want to set up an automated merge from the master to the feature/XYZ branch to pull the latest changes from the master to the feature branch - this is for the super project + all the 100 submodules (30 submodules repos might have conflicts also and for rest 70 we don't have the feature branch created but we need latest master changes so that there are no dependency issues). What is the best way to establish the merge mechanism considering the possibility of conflicts and dependency between the submodules? Thanks for your help in advance| Regards, Mohan -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/42580d06-2307-4940-a32d-5887112227bbn%40googlegroups.com.
