On Thu, Feb 03, 2011 at 08:31:13PM +0000, Peter Corlett wrote: > Branching is trivial. It's a fancy name for copy-and-paste. > > Taking the many copies that have now been hacked upon in a random > manner and consolidating them back into something coherent? That's a > little bit harder.
PRCS deferred merging to merge(1), but since it tracked parentage and common ancestors, it was able to do smartish things. not as good as git, but servicable. is there a knob for me to always default git merge to --no-commit ? -- Aaron J. Grier | "Not your ordinary poofy goof." | agr...@poofygoof.com
