How to manage different .gitmodules configuration in different branches and merge

[Zambon Federico]

Here is my situation and i can't find a clever solution.

Two different users need to have two different submodules' configuration so i created two branches of the super Repo with two different .gitmodules.

I want to be able to merge the two super Repo branches in both directions but keeping the .gitmodules of both branch untouched.

I'd prefer a solution that doesn't need to input terminal commands if possible.

Thanks in advance

Federico

[Zambon Federico · Accepted solution]

I found a workaround for this problem and i'll write it here so it may be useful for someone else.

I cloned the super repo and inserted the .gitmodules file in the gitignore file.

I thought it would mess with sourcetree but it didn't so we can have the .gitmodules in our working copy and we can push onto the other branch without messing with the submodules' configuration.

Obviously if we will have to make changes to the submodules configuration we will need to work on our local version of the .gitmodules file.