-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Made some updates this morning to the Git Guide in a number of areas, most importantly I've changed the example workflow to (a) avoid the "goto master, pull, goto branch, rebase, goto master, merge, push" dance and (b) discuss just working in master for those who do not like or understand the use of local branches, while still avoiding those cursed "merge" commits that pollute our history. All of this is made possible by git pull --rebase which I wasn't even aware of when I wrote the first draft of the guidelines. I've been using it myself lately and find it much simpler.
Sections also added for understanding branches, resolving conflicts, and the difference between merge and rebase. PLEASE read these carefully if you are having problems with git, and I cannot recommend these resources enough: http://book.git-scm.com/ http://www.kernel.org/pub/software/scm/git/docs/user-manual.html The first is the happy magical sugar git introduction, the second is much more in depth and suitable for drilling into specific topics. Hoping to get a git lunch and learn or something like that set up for next Wednesday. Cheers, Devan - -- Devan Goodwin <dgood...@redhat.com> Software Engineer Spacewalk / RHN Satellite Halifax, Canada 650.567.9039x79267 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkmdfLUACgkQAyHWaPV9my5zJQCggXuum2drh7C62mmSHcLZBH6p 8q4Ani+bx26ADzdBGBjafNevk/MbXIHh =ddta -----END PGP SIGNATURE----- _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
