On 08/24/2010 09:16 AM, Stephen Gallagher wrote: > -----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) Very good... thank you!!
steved. -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel
