On Thu, 2 Apr 2009, David Berry wrote:
> 2009/4/2 Peter W. Draper <[log in to unmask]>:
>> The eagle eyed amongst you may have noticed that I've merged my gaia-vo
>> developments to the trunk. To build this little lot you'll need to do
>> something like the following in an already built tree:
>>
>> 0) pull the changes and update the submodules:
>>
>> git pull --rebase
>> ./update-modules
>
> and meld pops up showing differences in the file
> applications/extractor/sextractor/man/sex.1 (it's only the date mind
> you), and then I get
>
> ERROR: submodule has modified files, not updating anything
> ... applications/extractor/sextractor
> M man/sex.1
>
This has long been fixed (no longer stored in the repository).
git submodule update
will force the issue.
> When we were having all the trouble with submodules, I knew what to do
> about this sort of thing, but I've forgotten. Pointers?
>
in this case
cd applications/extractor/sextractor
git checkout man/sex.1
may well clear it.
--
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj
|