git CONFLICT - cannot resolve main/thirdparty and scripts - howto resolve?

All, I believe my origin/master local git checkout is almost fixed, but I have several nasty warning and errors that remain when I run: /scripts/switch_all_submodules_to_head_and_clean The error are primarily with main/thirdparty and scripts. The full output of /scripts/switch_all_submodules_to_head_and_clean is available here along with the git status: http://www.3111skyline.com/dl/dt/trinity/err/git/master-conflicts.txt http://www.3111skyline.com/dl/dt/trinity/err/git/git-status.txt A summary of the errors are: 02:07 phoinix:/dat_e/tde> ./scripts/switch_all_submodules_to_head_and_clean drankin Preparing /dat_e/tde for development use error: 'main/thirdparty' appears as both a file and as a directory error: main/thirdparty: cannot drop to stage #0 warning: unable to rmdir scripts: Directory not empty HEAD is now at 8303efe Reset submodule main/tdepim to latest HEAD Auto-merging submodules CONFLICT (add/add): Merge conflict in submodules Adding scripts/update_all_submodules Adding scripts/switch_all_submodules_to_head_and_clean Adding scripts/commit_all_submodules Adding scripts/README CONFLICT (directory/file): There is a directory with name scripts in HEAD. Adding scripts as scripts~580909096c254a79aebd7c852d91b002cdf31c37 Adding main/thirdparty/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/git_05_11_2012/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice_ubuntu-tde-make-package-modules-not-stink.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-fix-tde-vcl.diff Adding main/thirdparty/libreoffice/3.6.0/patches/libreoffice-debian.diff Adding main/thirdparty/libreoffice/3.6.0/patches/README Adding main/thirdparty/libreoffice/3.3.3/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.3.3/patches/libreoffice-trinity-debian.diff Adding main/thirdparty/libreoffice/3.3.3/patches/NOTES Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity.diff Adding main/thirdparty/libreoffice/3.3.2/patches/libreoffice-trinity-debian.diff Adding main/thirdparty/libreoffice/3.3.2/patches/NOTES CONFLICT (directory/file): There is a directory with name main/thirdparty in HEAD. Adding main/thirdparty as main/thirdparty~580909096c254a79aebd7c852d91b002cdf31c37 Auto-merging main/tdewebdev CONFLICT (submodule): Merge conflict in main/tdewebdev Auto-merging main/tdevelop <snip -- many, many more CONFLICT (submodule)...> CONFLICT (add/add): Merge conflict in README.GIT Auto-merging .gitmodules CONFLICT (add/add): Merge conflict in .gitmodules Automatic merge failed; fix conflicts and then commit the result. error: 'main/thirdparty' appears as both a file and as a directory error: main/thirdparty: cannot drop to stage #0 warning: unable to rmdir scripts: Directory not empty HEAD is now at 8303efe Reset submodule main/tdepim to latest HEAD <snip> Cloning into 'main/applications/kdmtheme'... fatal: repository 'http://drankin@scm.trinitydesktop.org/scm/git/kdmtheme/' not found Clone of 'http://drankin@scm.trinitydesktop.org/scm/git/kdmtheme' into submodule path 'main/applications/kdmtheme' failed Entering 'experimental' Previous HEAD position was be11de5... Add tqt3 binary rename Switched to branch 'master' Your branch is up-to-date with 'origin/master'. <snip> Entering 'main/dependencies/python-tqt' Already on 'master' Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) <snip> Entering 'main/dependencies/python-tqt' Updating 9092fbf..a582675 Fast-forward sip/qt/qstyle.sip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) <snip> Entering 'experimental' This script can only be run from a top level git directory. Exiting... Stopping at 'experimental'; script returned non-zero status. The git status command shows the following: 02:38 phoinix:/dat_e/tde> git status On branch master Your branch and 'origin/master' have diverged, and have 8401 and 3271 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: .gitmodules deleted: main/applications/kdmtheme 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) modified: experimental (new commits) modified: main/applications/abakus (new commits) modified: main/applications/adept (new commits) modified: main/applications/amarok (new commits) <snip> I was able to manually 'git rm main/applications/kdmtheme' to resolve that issue, but no matter if I "git add <file>..." or "git checkout -- <file>...", when I go to "git commit -a" I am left in vim with: 03:22 phoinix:/dat_e/tde> cat .git/COMMIT_EDITMSG # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Committer: David C. Rankin <david (the at symbot) rlfpllc.com> # # On branch master # Your branch and 'origin/master' have diverged, # and have 8401 and 3271 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) # # Changes to be committed: # modified: .gitmodules # modified: experimental # modified: main/applications/abakus # modified: main/applications/adept # modified: main/applications/amarok # modified: main/applications/basket I just want to overwrite whatever I have with HEAD, not commit anything back to git.trinitydesktop.org -- so what should I do when I am prompted by git commit -a with this long file of commented changes? Any help would be greatly appreciated. -- David C. Rankin, J.D.,P.E.