On Thu, 2010-11-25 at 13:33 +0200, thorsten.i.r...@jyu.fi wrote: > >> fgdata, but while git status lists a couple of files as having > >> differences, that are files I know should be different because I changed > >> them. No aircraft is listed as being different. > >
Hi Thorsten, For me 'git pull' will fail on an update if I have changed files in the local repo... even the smallest change... it mumbles something about a 'merge' failed... I have to do - when 'git status' shows changed, tracked files - is 'git add changed-file-name', for each change, then 'git commit -m "message" --author "you <y...@dot.com>" changed-file-name' to commit these changes to my local repo... Likewise, if I do 'git diff' and differences are shown, then I 'know' I have uncommitted changes, which will show up in a git status, and I do the above 'add' & 'commit'... Now the changes are committed, 'git diff' shows nothing, git status may continue to show some 'untracked' changed files... I forget about these... Now to see the diff between me and the master repo, I do - git format-patch -o ../../patches origin/master It certainly seems easier to get a 'git' repo into a 'bad' state. I used to do such repo updates in a blind batch process, but with git, I have returned to manual so I can take the time to read 'exactly' what git reported, or did not report ;=)) Hope this helps... Regards, Geoff. ------------------------------------------------------------------------------ Increase Visibility of Your 3D Game App & Earn a Chance To Win $500! Tap into the largest installed PC base & get more eyes on your game by optimizing for Intel(R) Graphics Technology. Get started today with the Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs. http://p.sf.net/sfu/intelisp-dev2dev _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
