...
[13:31:38 CDT(-0500)] <athena> 
[13:32:06 CDT(-0500)] <athena> so i think i need to create a local branch that tracks the uportal master branch?
[13:32:34 CDT(-0500)] <athena> and then commit to that
[13:32:36 CDT(-0500)] <athena> does that sound right?
[13:33:20 CDT(-0500)] <EricDalquist> yes
[13:33:32 CDT(-0500)] <athena> ok
[13:33:41 CDT(-0500)] <athena> now i just need to figure out how to switch over to that from my fork 
[13:33:55 CDT(-0500)] <EricDalquist> so if you have your fork cloned locally
[13:34:01 CDT(-0500)] <athena> i do
[13:34:03 CDT(-0500)] <EricDalquist> and you're on master (git checkout master)
[13:34:13 CDT(-0500)] <EricDalquist> do: git checkout -b MyNewFeatureBranch
[13:34:15 CDT(-0500)] <athena> right now on a branch off my locally cloned master
[13:34:31 CDT(-0500)] <athena> and i think i want to be on the uportal master
[13:34:49 CDT(-0500)] <EricDalquist> ah so if you want to be on the uPortal master you need to clone the actual uPortal repository
[13:34:54 CDT(-0500)] <athena> yeah
[13:34:55 CDT(-0500)] <EricDalquist> I think
[13:34:57 CDT(-0500)] <athena> don't think i've done that yet
[13:35:05 CDT(-0500)] <EricDalquist> oh wait ... I think you can do it locally
[13:35:45 CDT(-0500)] <EricDalquist> are you willing to be a guenea pig here?
[13:35:57 CDT(-0500)] <athena> sure, though maybe i should wait until i get back
[13:36:00 CDT(-0500)] <athena> have to run out for a bit
[13:36:06 CDT(-0500)] <EricDalquist> ok
[13:36:11 CDT(-0500)] <EricDalquist> git remote add upstream git@github.com:Jasig/uPortal.git
[13:36:22 CDT(-0500)] <EricDalquist> that should add a new remote called upstream
[13:36:33 CDT(-0500)] <EricDalquist> linked to the real uPortal repo
[13:36:40 CDT(-0500)] <EricDalquist> and I think you can checkout branches from any remote
[13:36:44 CDT(-0500)] <athena> gotcha
[13:38:12 CDT(-0500)] <athena> ok, back in a bit