Found the problem. Sorry for the noise. On my notebook, the git pull origin aborted and I did not notice this. preferences.xml had been changed in * master (my local branch). I did a git checkout preferences.xml git pull origin and got a lot of updates.
Dave P. On 08/01/2010 01:25 PM, dave perry wrote: > On 08/01/2010 01:07 PM, dave perry wrote: > >> Need some help, >> >> I did some clean up of the pa24-250 on my desktop which included >> creating a pa24-250/Nasal folder and moving all the nasal files to that >> folder. I also created pa24-250-base.xml that contained all the common >> lines for the set file and now pa24-250-CIIB-set.xml and >> pa24-250-CIII-set.xml contain the lines unique to the two auto pilots >> and include the common base file. I did the same for the model files. >> >> I used git status to identify what needed to be done before >> git commit >> git merge origin/master >> git push origin master. >> >> But when I did a >> git pull origin >> from my notebook, I do not see the changes. >> ------------------------------------------------------------------------------ The Palm PDK Hot Apps Program offers developers who use the Plug-In Development Kit to bring their C/C++ apps to Palm for a share of $1 Million in cash or HP Products. Visit us here for more details: http://p.sf.net/sfu/dev2dev-palm _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
