Sorry to bother with trivia, but my inability to use GIT properly starts to annoy me.
What I want is my personally customized branch of FGData in which I can do texturing experiments and develop Local Weather ahead of what is in master, which is then periodically updated to whatever else has been happening in master. So, I have my branch local-weather in which I work. When I want to update, I do git status That gives me a list of files which I have modified and need attention. So, I do git add <filename> till the list is done, followed by git commit -m "<my changes>" Then my branch seems to be fine, I can switch back and force via git checkout master / git checkout local-weather As described in or wiki here http://wiki.flightgear.org/index.php/FlightGear_and_Git I then switch to master, do a git pull git checkout local-weather git rebase master Now the trouble starts, because after the final command, the system bitches about merging conflicts and asks me to resolve them or use git rebase --skip to continue. If I simply continue, then basically all my custom changes get erased. Somehow, I'm expected to do something which isn't covered in the Wiki. The man page of git rebase talks about a lot of interesting things like 'patience', 'subtree' and 'octopus' which just confuses me more. I think my time is better spent thinking about atmospheric light scattering, cloud interaction with terrain and such things than about cephalopods. So far, my counter-strategy has been to manually copy all my changes elsewhere, find my changes erased after the update, and copy my customizations back. Can be done in 5 minutes, i.e. is faster than understanding octopus-lore, but it's sort of stupid to work against the system... What I want the system to do is rather simple: * when in doubt, use my version of the file, because either it's my own code, or it's a texture according to my taste * but since I've modified also preferences.xml and materials.xml where someone else would want to write into, give me a list of possible conflicts so that I may have a look manually after the update if one of these is involved I'm sure one can train GIT to do the trick, the problem is just that using GIT for what I want out of it seems like using General Relativity to compute an airplane trajectory - it works, it gives you the right result, but it is needlessly complicated because you carry so much overhead which you don't really need for the specific task. So if anyone could spare me the additional time after reading through this to tell me how I can teach GIT to do what I want, I'd be very grateful. I'm sure I'm overlooking something very simple... Thanks, * Thorsten ------------------------------------------------------------------------------ Achieve unprecedented app performance and reliability What every C/C++ and Fortran developer should know. Learn how Intel has extended the reach of its next-generation tools to help boost performance applications - inlcuding clusters. http://p.sf.net/sfu/intel-dev2devmay _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
