On 12/31/2013 12:04 PM, Slávek Banko wrote:
> I assume that your folder 'scripts' is not as a separate git module (current 
> state), but as a folder of the 'master' module 'tde' (former state)? Are in 
> your .gitmodules information about git module 'scripts'?

You are 100% correct :)

I could see git complaining about the scripts file/directory issue, but I could
not figure out what command would fix the conflict.

> 
> First, try on the master tde module:
> git checkout master && git pull --rebase
> 
> Once you are in your .gitmodules information about git module 'scripts', 
> continue:
> git submodule init -- scripts && git submodule update -- scripts
> 
> Then you can try again:
> scripts/switch_all_submodules_to_head_and_clean

Thank you Slavek! I will give it a go and report back. I'm pulling a fresh
v3.5.13-sru on the box on a different partition right now (I gave up fixing that
one), when it completes I'll try the:

 git checkout master && git pull --rebase

But what do you mean by:

<quote>
> Once you are in your .gitmodules information about git module 'scripts',
> continue:
</quote>

Are you saying "When it dies and you have to manually edit .gitmodules to get
rid of <<<<<<<<<<< scripts stuff =========== or scripts stuff >>>>>>>>>>,
continue: with git submodule init -- scripts && git submodule update -- scripts"

??

-- 
David C. Rankin, J.D.,P.E.