-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/24/2010 08:55 AM, Steve Dickson wrote: > Hello, > > How I merge the latests changes from the remotes/origin/f13/master > on to my f13/user/steved/pnfs-13 remote branch? > The easiest way would be to switch to the pnfs-13 branch and then do: git rebase origin/f13/master This will apply any patches atop the branch point of your branch, then attempt to apply your branch's patches atop those (stopping if there are merge conflicts that need to be resolved) - -- Stephen Gallagher RHCE 804006346421761 Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAkxzxhIACgkQeiVVYja6o6PDxgCcCDEsLaBVMYZ22ttrEld2erEv BaMAn2sofQZ8JeRLixt/5BwDx66ZLIz/ =R6JC -----END PGP SIGNATURE----- -- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel
