Re: gEDA-dev: Considering git

[Peter TB Brett <peter-at-NOSPAMpeter-b_dot_co_dot_uk>]

On Friday 08 June 2007 18:14:04 Peter TB Brett wrote:

>   cg-fetch origin
>   cg-switch origin
>   cg-merge cool-feature
> .... fix conflicts ....
>   cg-push origin

Except this won't actually work because you can't cg-switch to a remote 
branch.  Actual workflow would be more like:

  cg-fetch origin
  cg-merge origin
.... fix conflicts ....
  cg-push origin

Note that *pushing* is the potentially destructive operation when using git, 
*not* committing.  Important!

Peter

-- 
Fisher Society                              http://tinyurl.com/o39w2
CU Small-Bore Club                          http://tinyurl.com/mwrc9

      09f911029d74e35bd84156c5635688c0            peter-b.co.uk

PGP signature

_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev