...
[15:32:59 CDT(-0500)] <EricDalquist> so those commits only exist on your machine
[15:33:08 CDT(-0500)] <EricDalquist> ok you want to do that now?
[15:33:13 CDT(-0500)] <EricDalquist> I still have some time to help 
[15:33:48 CDT(-0500)] <JoeMoore> Just to clarify what I'd done before first. If I was a co-committer, what I did before would make more sense, right?
[15:33:59 CDT(-0500)] <EricDalquist> yes
[15:34:03 CDT(-0500)] <JoeMoore> Since Im not, its much cleaner to create a private fork.
[15:34:07 CDT(-0500)] <EricDalquist> yes
[15:34:14 CDT(-0500)] <EricDalquist> even I have a personal fork
[15:34:26 CDT(-0500)] <EricDalquist> since I can then push feature branches I'm working on to that
[15:34:29 CDT(-0500)] <EricDalquist> for others to look at
[15:34:46 CDT(-0500)] <JoeMoore> Then yes, I think this is becoming clear enough so that will only take me a few minutes
[15:34:48 CDT(-0500)] <EricDalquist> and not bother with main repository with them until I merge the feature branch into master and push that
[15:34:52 CDT(-0500)] <EricDalquist> great
[15:34:57 CDT(-0500)] <EricDalquist> so go here https://github.com/Jasig/uPortal
[15:35:03 CDT(-0500)] <EricDalquist> and click that fork button in the upper right
[15:35:34 CDT(-0500)] <JoeMoore> yes, im there and logged in
[15:35:56 CDT(-0500)] <JoeMoore> I see my old clone that references your master from 7 months ago
[15:36:18 CDT(-0500)] <EricDalquist> great
[15:36:45 CDT(-0500)] <EricDalquist> so the first thing we'll do is in your local command line run "git remote rename origin upstream"
[15:37:00 CDT(-0500)] <EricDalquist> git remote names are free form but there are two conventions
[15:37:28 CDT(-0500)] <EricDalquist> origin - the name of the remote repository that you control (your fork)
[15:37:28 CDT(-0500)] <EricDalquist> upstream - the name of the remote repository which is the primary for the project
[15:38:09 CDT(-0500)] <JoeMoore> OK, that rename has run
[15:38:31 CDT(-0500)] <EricDalquist> now copy the ssh url from your fork on github
[15:38:34 CDT(-0500)] <EricDalquist> should look like "git@github.com:edalquist/uPortal.git"
[15:38:37 CDT(-0500)] <EricDalquist> but with your username
[15:39:07 CDT(-0500)] <EricDalquist> and do "git remote add origin git@github.com:edalquist/uPortal.git"
[15:39:42 CDT(-0500)] <JoeMoore> OK, it looks like it worked
[15:39:49 CDT(-0500)] <EricDalquist> now a "git remote -v" should look like:
[15:39:49 CDT(-0500)] <EricDalquist> origin git@github.com:edalquist/uPortal.git (fetch)
[15:39:49 CDT(-0500)] <EricDalquist> origin git@github.com:edalquist/uPortal.git (push)
[15:39:49 CDT(-0500)] <EricDalquist> upstream git@github.com:Jasig/uPortal.git (fetch)
[15:39:49 CDT(-0500)] <EricDalquist> upstream git@github.com:Jasig/uPortal.git (push)
[15:40:13 CDT(-0500)] <EricDalquist> well your upstream url(s) will be different since you don't have write access to Jasig/uPortal
[15:40:29 CDT(-0500)] <JoeMoore> Yup. All 4 lines match.
[15:40:34 CDT(-0500)] <EricDalquist> great
[15:40:43 CDT(-0500)] <EricDalquist> now try doing "git push origin"
[15:41:01 CDT(-0500)] <EricDalquist> that should push the latest commits in master to your fork
[15:41:39 CDT(-0500)] <JoeMoore> it needs to audit my fingerprint.
[15:41:55 CDT(-0500)] <JoeMoore> so ill go there quickly
[15:41:58 CDT(-0500)] <EricDalquist> ok
[15:43:15 CDT(-0500)] <JoeMoore> that was painless. it only listed one server and thats the exact one im working on.
[15:43:23 CDT(-0500)] <EricDalquist> great
[15:43:39 CDT(-0500)] <JoeMoore> it ran through 2938 objects and said its done
[15:43:55 CDT(-0500)] <JoeMoore> nope. 9346 objects
[15:44:01 CDT(-0500)] <JoeMoore> it compressed the first number
[15:44:07 CDT(-0500)] <EricDalquist> now if you go to your fork you should see that master there matches up with master in jasig/uPortal
[15:44:25 CDT(-0500)] <EricDalquist> the next question ... is there anything in your local commits on your branch off of 4.0.5 that is private?
[15:44:33 CDT(-0500)] <JoeMoore> authored 4 hours ago
[15:44:35 CDT(-0500)] <JoeMoore> perfect
[15:44:52 CDT(-0500)] <EricDalquist> because with the free account your fork is publicly visible
[15:44:53 CDT(-0500)] <JoeMoore> yes, there are some passwords
[15:44:57 CDT(-0500)] <EricDalquist> ok
[15:45:02 CDT(-0500)] <EricDalquist> so we can't do this next step
[15:45:08 CDT(-0500)] <EricDalquist> until you get yourself a private repository
[15:45:13 CDT(-0500)] <EricDalquist> either by paying github
[15:45:43 CDT(-0500)] <EricDalquist> or setting up some sort of local git hosting solution (a very simple local git host is a server you can ssh to that has git installed on it)
[15:46:07 CDT(-0500)] <JoeMoore> OK, Ill need to think about the pros and cons of that.
[15:46:09 CDT(-0500)] <EricDalquist> the next step if you have a private repo would be "git push origin your4.0.5branchname"
[15:46:43 CDT(-0500)] <EricDalquist> you need to do that to push a branch that only exists locally to a remote where the branch does not exist yet
[15:47:04 CDT(-0500)] <EricDalquist> after that "git push origin" will push changes to all branches that the remote knows about
[15:47:26 CDT(-0500)] <EricDalquist> also ... lets say 4.0.6 comes out tomorrow and you want to upgrade your branch to it
[15:47:34 CDT(-0500)] <JoeMoore> makes sense
[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