On Sun, Nov 14, 2010 at 8:42 PM, Shaping <shap...@charter.net> wrote: >I have not convince myself yet that Git > will keep old changes separate from those from the new update.
I only know the command line so I'll give you command line tips and you can translate them to equivalent GUI commands. 1) Clone the factor respository git clone git://factorcode.org/git/factor.git 2) In this repository you make your own changes, including adding stuff to the work directory, editing files, etc. Now you want to save those in git so you can update safely. git add work/my-new-vocab/* git add any-other-new-files got commit -m "This is a message describing my changes" 3) Now you want to retrieve the latest changes from the factor repository: git fetch origin 4) Note that step (3) only retrieved the changes. It has made no changes to your actual physical source code. To update that, assuming you've done (2): git rebase origin/master Replace 'origin/master' with 'origin/clean-...' or whatever branch you are using from the factor repository. Probably master as that's the default. If there is a clash between your changes and the factor repository you'll get the chance to edit your changes and fix the clash. You can then do: git add ...file-containing-fixes git rebase --continue Or, if you are panicing, you can abort the rebase and be back to just a repository with your changes: git rebase --abort These steps will ensure that your changes always are based on top of the latest factor repository changes, making it easy to use 'git log' and friends to see what your changes are, and to contribute them back to factor one day. Chris. -- http://www.bluishcoder.co.nz ------------------------------------------------------------------------------ Centralized Desktop Delivery: Dell and VMware Reference Architecture Simplifying enterprise desktop deployment and management using Dell EqualLogic storage and VMware View: A highly scalable, end-to-end client virtualization framework. Read more! http://p.sf.net/sfu/dell-eql-dev2dev _______________________________________________ Factor-talk mailing list Factor-talk@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/factor-talk
