Dependent Origination

merge conflict for a git submodule entry point

Posted on: January 17, 2014

let’s say path/to/submodule is a newly added git submodule, but we are merging in a branch which was created before the submodule was created, now git merge added a directory itself, which obviously you cannot either git add or git rm, since that would destroy the submodule setup in HEAD.

what can you do?

run git mergetool and you are done! git will discover itself that it doesn’t need to do anything about this submodule and that is the best solution.

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

Advertisements
January 2014
M T W T F S S
« Dec   Feb »
 12345
6789101112
13141516171819
20212223242526
2728293031  

Twitter

Flickr Photos

%d bloggers like this: