Guys, I have used the switch_all_submodules_to_head_and_clean script to update repositories that were about a year old. This has totally messed up my local copies. Please note: I DO NOT HAVE ANY LOCAL CHANGES. I JUST WANT TO PULL A FRESH COPY OF NEW/CHANGED FILES FROM THE SERVER. After running the switch_all script 'git status' shows: $ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 8438 and 3318 different commits each, respectively. # # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add <file>..." to mark resolution) # # added by us: submodules # # 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: main/applications/abakus (modified content) # modified: main/applications/adept (modified content) # modified: main/applications/amarok (modified content) # modified: main/applications/basket (modified content) # modified: main/applications/bibletime (modified content) # modified: main/applications/compizconfig-backend-kconfig (modified content) # modified: main/applications/desktop-effects-tde (modified content) # modified: main/applications/digikam (modified content) # modified: main/applications/dolphin (modified content) # modified: main/applications/filelight (modified content) # modified: main/applications/fusion-icon (modified content) # modified: main/applications/gtk-qt-engine (modified content) # modified: main/applications/gwenview (modified content) # modified: main/applications/k3b (modified content) # modified: main/applications/k9copy (modified content) # modified: main/applications/kaffeine (modified content) # modified: main/applications/kaffeine-mozilla (modified content) # modified: main/applications/katapult (modified content) # modified: main/applications/kbarcode (modified content) # modified: main/applications/kbfx (modified content) # modified: main/applications/kbookreader (modified content) # modified: main/applications/kchmviewer (modified content) # modified: main/applications/kcpuload (modified content) # modified: main/applications/kdbusnotification (modified content) # modified: main/applications/kdiff3 (modified content) # modified: main/applications/kdirstat (modified content) # modified: main/applications/kdmtheme (modified content) # modified: main/applications/kdpkg (modified content) # modified: main/applications/keep (modified content) # modified: main/applications/kerry (modified content) # modified: main/applications/kgtk-qt3 (modified content) # modified: main/applications/kile (modified content) # modified: main/applications/kima (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/kiosktool (modified content) # modified: main/applications/kmplayer (modified content) # modified: main/applications/kmyfirewall (modified content) # modified: main/applications/kmymoney (modified content) # modified: main/applications/knemo (modified content) # modified: main/applications/knetload (modified content) # modified: main/applications/knetstats (modified content) # modified: main/applications/knetworkmanager8 (modified content) # modified: main/applications/knetworkmanager9 (modified content) # modified: main/applications/knights (modified content) # modified: main/applications/knowit (modified content) # modified: main/applications/knutclient (modified content) # modified: main/applications/koffice (modified content) # modified: main/applications/konversation (modified content) # modified: main/applications/kopete-otr (modified content) # modified: main/applications/kpicosim (modified content) # modified: main/applications/kpilot (modified content) # modified: main/applications/kpowersave (modified content) # modified: main/applications/kradio (modified content) # modified: main/applications/krename (modified content) # modified: main/applications/krusader (modified content) # modified: main/applications/ksplash-engine-moodin (modified content) # modified: main/applications/ksquirrel (modified content) # modified: main/applications/kstreamripper (modified content) # modified: main/applications/ksystemlog (modified content) # modified: main/applications/ktechlab (modified content) # modified: main/applications/ktorrent (modified content) # modified: main/applications/kuickshow (modified content) # modified: main/applications/kvirc (modified content) # modified: main/applications/kvkbd (modified content) # modified: main/applications/piklab (modified content) # modified: main/applications/potracegui (modified content) # modified: main/applications/rosegarden (modified content) # modified: main/applications/smartcardauth (modified content) # modified: main/applications/smb4k (modified content) # modified: main/applications/soundkonverter (modified content) # modified: main/applications/tde-guidance (modified content) # modified: main/applications/tde-style-lipstik (modified content) # modified: main/applications/tde-style-qtcurve (modified content) # modified: main/applications/tde-systemsettings (modified content) # modified: main/applications/tdesudo (modified content) # modified: main/applications/tdesvn (modified content) # modified: main/applications/tellico (modified content) # modified: main/applications/twin-style-crystal (modified content) # modified: main/applications/wlassistant (modified content) # modified: main/applications/yakuake (modified content) # modified: main/dependencies/arts (modified content) # modified: main/dependencies/dbus-1-tqt (modified content) # modified: main/dependencies/dbus-tqt (modified content) # modified: main/dependencies/tqtinterface (modified content) # modified: main/libraries/kipi-plugins (modified content) # modified: main/libraries/libkdcraw (modified content) # modified: main/libraries/libkexiv2 (modified content) # modified: main/libraries/libkipi (modified content) # modified: main/libraries/libksquirrel (modified content) # modified: main/libraries/mlt (modified content) # modified: main/libraries/mlt++ (modified content) # modified: main/libraries/pytdeextensions (modified content) # modified: main/libraries/python-trinity (modified content) # modified: main/tde-i18n (modified content) # modified: main/tdeaccessibility (modified content) # modified: main/tdeaddons (modified content) # modified: main/tdeadmin (modified content) # modified: main/tdeartwork (modified content) # modified: main/tdebase (modified content) # modified: main/tdebindings (modified content) # modified: main/tdeedu (modified content) # modified: main/tdegames (modified content) # modified: main/tdegraphics (modified content) # modified: main/tdelibs (modified content) # modified: main/tdemultimedia (modified content) # modified: main/tdenetwork (modified content) # modified: main/tdepim (modified content) # modified: main/tdesdk (modified content) # modified: main/tdetoys (modified content) # modified: main/tdeutils (modified content) # modified: main/tdevelop (modified content) # modified: main/tdewebdev (modified content) # no changes added to commit (use "git add" and/or "git commit -a") 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? -- David C. Rankin, J.D.,P.E.