Re: How do I...
From: Frank Sorenson <hidden>
Date: 2016-06-15 22:41:56
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dave Kleikamp wrote:
I'm not sure if I was clear. cg-pull should be 'cg-pull origin".
Got it, and it does just what I wanted.
I take this to mean you're seeing problems with cg-update too. cg-update simply runs cg-pull & cg-merge together, so running them separately shouldn't make any difference.
Yes. cg-pull and cg-update have both shown odd breakage of this sort, putting my tree into a bad state. Sometimes deleting files fixes it, but more often than not, I've needed to just start a new tree again in order to fix it. This is probably due to inexperience with git, but tree corruption probably shouldn't occur like this. Frank - -- Frank Sorenson - KD7TZK Systems Manager, Computer Science Department Brigham Young University frank@tuxrocks.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCe8BxaI0dwg4A47wRAk2OAJ915s2KHTNxrpi6k3wa7HiDhpOFGgCgrMxp 73JzFxl7lg2c9korTF8L7Ek= =ILPh -----END PGP SIGNATURE-----