Hi.
I just tried to update my starlink sources:
% git pull
remote: Counting objects: 284, done.
remote: Compressing objects: 100% (224/224), done.
remote: Total 224 (delta 181), reused 0 (delta 0)
Receiving objects: 100% (224/224), 23.83 KiB, done.
Resolving deltas: 100% (181/181), completed with 59 local objects.
From git://starlink.jach.hawaii.edu/starlink
f89b8d6..8b9f1e3 master -> origin/master
Updating f89b8d6..8b9f1e3
fatal: Untracked working tree file 'thirdparty/heasarc/cfitsio/cfitsio/.gitignore' would be removed by merge.
not sure what I was supposed to do about that, I had a go at:
% rm thirdparty/heasarc/cfitsio/cfitsio/.gitignore
but that didn't help much:
% git pull
Updating f89b8d6..8b9f1e3
applications/smurf/libacsis/specwrite: needs update
thirdparty/eso/skycat/skycat: needs update
thirdparty/heasarc/cfitsio/cfitsio/.gitignore: needs update
fatal: Updating 'thirdparty/heasarc/cfitsio/cfitsio' would lose untracked files in it
so I stopped fiddling. Can anyone help? I haven't made any local
modifications, other than doing a build.
thanks
Mark
--
Mark Taylor Astronomical Programmer Physics, Bristol University, UK
[log in to unmask] +44-117-928-8776 http://www.star.bris.ac.uk/~mbt/
