...
[15:47:36 CDT(-0500)] <EricDalquist> you would do "git merge uportal-4.0.6"
[15:48:00 CDT(-0500)] <EricDalquist> that will take all the commits that have happened from 4.0.5 and 4.0.6 in the jasig/uportal/master branch
[15:48:04 CDT(-0500)] <EricDalquist> and merge them into your branch
[15:48:43 CDT(-0500)] <EricDalquist> I know that was a lot of stuff
[15:48:50 CDT(-0500)] <EricDalquist> but hopefully you're feeling a little better about git
[15:48:58 CDT(-0500)] <EricDalquist> I'm going through and updating our git workflow docs
[15:49:11 CDT(-0500)] <EricDalquist> and will try and clarify a bunch of stuff
[15:49:24 CDT(-0500)] <JoeMoore> so do those last statements about upgrading apply without pushing origin back?
[15:49:40 CDT(-0500)] <EricDalquist> yes
[15:50:03 CDT(-0500)] <EricDalquist> the only reason you would want to do the "git push origin yourbranch" is to have a shared location for the branch
[15:50:11 CDT(-0500)] <EricDalquist> like if another dev on your team wanted to work on that same branch
[15:50:14 CDT(-0500)] <EricDalquist> or you wanted a backup
[15:50:24 CDT(-0500)] <EricDalquist> if you're happy just working on your local repository
[15:50:31 CDT(-0500)] <EricDalquist> you don't need origin at all
[15:52:04 CDT(-0500)] <JoeMoore> I thought so. Thank you! I'm saving the pointer to this log. Now I'll go back and try to redo my ant commands against my pristine 4.0.5 with local changes after checking pom.xml in cas
[15:52:15 CDT(-0500)] <EricDalquist> sounds good
[15:52:23 CDT(-0500)] <EricDalquist> hopefully we can have better wiki docs before I go home today too 
[16:02:05 CDT(-0500)] <peterjhart> EricDalquist: the SCSS builds fine for me. There are a few differences between the resulting portal.css and the portal.css in master. I can't look into it right now, though