All,

  I have my abakus GIT tree messed up:

15:04 providence:/mnt/pv/home/david/tde13/tde/main/applications/abakus> git
checkout -f v3.5.13-sru
Already on 'v3.5.13-sru'
Your branch and 'origin/v3.5.13-sru' have diverged,
and have 66 and 11 different commits each, respectively.
15:04 providence:/mnt/pv/home/david/tde13/tde/main/applications/abakus> git pull
U       admin
U       cmake
U       src/CMakeLists.txt
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

  How in the heck do I fix this? I've googled, I've 'git checkout --
src/CMakeLists.txt', I've git status, I've git diffed, but I can just tell it to
throw away all the stuff I have in abakus and just download a fresh copy of
origin/v3.5.13-sru

What is the trick?

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