Git submodule hash keeps causing conflicts

Question

Everytime I make changes in the submodule, git registers the new commit in my original project

This causes loads of conflicts between different team members. How can this be prevented?

Chris Maes · Accepted Answer · 2019-09-24 14:16:52Z

4

You cannot simply prevent this. The commit hash of for your submodule is stored in a file, so if you change that commit hash in two branches of your super-project, then you will inevitably have a merge conflict.

If you need to change the submodule for every commit however, then maybe your submodule shouldn't have been a submodule in the first place. You can look here on how to merge a submodule into the parent tree.

Also: take a look here on how to manage conflicts with submodules.

answered Sep 24, 2019 at 14:16

Chris Maes

38.2k15 gold badges119 silver badges158 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

Skarlinski Over a year ago

Cant that file be added to git-ignore somehow?

Devin Rhode Over a year ago

Adding to git-ignore is pointless, the point of a submodule is the SHARE code.

Collectives™ on Stack Overflow

Git submodule hash keeps causing conflicts

1 Answer 1

2 Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related