Re: Making git as easy as CVS, for handling merge conflicts - Simple git instructions

[gameonlinux]

If RMS is new to git you can make it simple:

You update a file you edited to git (example: updating some QuakeC code 
and some 3d models and textures):
git add file1.qc file2.qc 
../../models/bots/girls/12yrold_latemodel_lod1.iqm 
../../models/bots/girls/12yr*iqm*skin* ../../textures/grlcutepnk*.tga

You then commit the files (with the only message the internet users 
deserve):
git commit -m "X"

You then push it to the remote server (over tor):
torify git push


Oh and before all this: /etc/init.d/tor start
("X" being the commit message, which should just be "X" so you don't 
have to bother)

You can just copy your git repos to bluerays
Git allows you to _always_ be on a war footing; thus if someone deletes 
your project on the remote server you just set up an accepting git repo 
somewhere else and push there, or just distribute amongst your friends 
in real life the blueray discs.

Also: I never auto-merge anything: everything is hand merged. This helps 
you learn what is going on at all times.