...
[15:02:36 CDT(-0500)] <EricDalquist> if you just want to use the latest 3.2 code
[15:03:09 CDT(-0500)] <EricDalquist> you could do:
[15:03:09 CDT(-0500)] <EricDalquist> git fetch upstream
[15:03:09 CDT(-0500)] <EricDalquist> git checkout rel-3-2-patches
[15:03:09 CDT(-0500)] <EricDalquist> git merge upstream/rel-3-2-patches
[15:03:17 CDT(-0500)] <EricDalquist> that would get you the rel-3-2-patches with the latest code on it
[15:03:38 CDT(-0500)] <EricDalquist> if you have a local branch of rel-3-2-patches which your 3.2 install is based on you would then do
[15:03:48 CDT(-0500)] <EricDalquist> git checkout your-3-2-branch
[15:03:53 CDT(-0500)] <EricDalquist> git merge rel-3-2-patches
[15:04:04 CDT(-0500)] <EricDalquist> which would merge the latest changes from the rel-3-2-patches branch into your branch