On Tuesday 31 of December 2013 18:36:49 David C. Rankin wrote: > On a second box after trying all the suggested "git add" and "git commit > -a", I am left with: > > 11:25 providence:~/tde/tde> git status > # On branch master > # Your branch and 'origin/master' have diverged, > # and have 9509 and 3318 different commits each, respectively. > # > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) # (commit or discard the untracked or modified content in > submodules) # > # modified: experimental (new commits) > # modified: main/applications/kdmtheme (modified content) > # modified: main/applications/kio-apt (modified content) > # modified: main/applications/kio-locate (modified content) > # modified: main/applications/kio-umountwrapper (modified content) > # modified: main/applications/knetworkmanager9 (modified content) > # modified: main/applications/kpowersave-nohal (modified content) > # modified: main/applications/kradio (modified content) > # > no changes added to commit (use "git add" and/or "git commit -a") > > But nothing else will help for those files. Further, the content of the > local copy does not match the content on > http://git.trinitydesktop.org/cgit/scripts/tree/ > > 11:28 providence:~/tde/tde> ll scripts/ > total 24 > -rwxr-xr-x 1 david david 1571 Dec 31 01:17 commit_all_submodules > -rw-r--r-- 1 david david 128 Dec 31 01:17 README > -rwxr-xr-x 1 david david 1463 Dec 31 01:17 > switch_all_submodules_to_head_and_clean -rwxr-xr-x 1 david david 1940 Dec > 31 01:17 update_all_submodules > > > I have tried every from of git commit command either (1) suggested by git > in the error messages or (2) from > https://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving >-a-merge Nothing works. Why does the switch script not simply: > > "throw away any changes and get a fresh copy of the source" > > That is exactly what I want to do -- how can I do that? > > I do not want to waste the bandwidth to pull new copies of the code on 3 > different servers, but I've exhausted all suggestions I can find. How do I > fix this? 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'? 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 -- Slavek