On 08/15/2012 03:10 PM, David C. Rankin wrote: > 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? > I give up! No matter what I do, I alway end up in this F'ed up state where git pull puts this garbage in src/CMakeLists.txt tde_add_executable( abakus AUTOMOC SOURCES abakus.cpp abakuslistview.cpp dragsupport.cpp editor.cpp evaluator.cpp function.cpp mainwindow.cpp node.cpp numerictypes.cpp result.cpp resultlistview.cpp resultlistviewtext.cpp rpnmuncher.cpp valuemanager.cpp dcopIface.skel ${BF_SOURCES} ${MPFR_SOURCES} <<<<<<< HEAD LINK kio-shared tdecore-shared tdeprint-shared tdeui-shared DCOP-shared ${MPFR_LIBRARIES} ======= LINK kio-shared kdecore-shared kdeprint-shared kdeui-shared DCOP-shared ${MPFR_LIBRARIES} >>>>>>> 44ac2bccce5cbeb595a717755de8d1017d12981a DESTINATION ${BIN_INSTALL_DIR} ) Even if I follow directions, manually merge the file by deleting: <<<<<<< HEAD LINK kio-shared tdecore-shared tdeprint-shared tdeui-shared DCOP-shared ${MPFR_LIBRARIES} ======= >>>>>>> 44ac2bccce5cbeb595a717755de8d1017d12981a and leaving the wanted: LINK kio-shared kdecore-shared kdeprint-shared kdeui-shared DCOP-shared I still en up with: 16:00 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'. I have no idea how to fix the admin and cmake directories? Git wizards how do you fix this? -- David C. Rankin, J.D.,P.E.