Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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


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


1 answer

1 accepted

0 votes
Answer accepted

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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

7,026 views 5 13
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you