...
[12:51:38 CST(-0600)] <EricDalquist> I think I might have setup the uportal pom to just have those git options setup
[12:52:09 CST(-0600)] <EricDalquist> looks like I added localCheckout
[12:52:12 CST(-0600)] <athena> ah, nice
[12:52:15 CST(-0600)] <EricDalquist> not sure why I didn't add no-push
[12:52:18 CST(-0600)] <athena> 
[12:52:24 CST(-0600)] <EricDalquist> https://github.com/Jasig/uPortal/blob/master/pom.xml
[12:52:28 CST(-0600)] <athena> would that have affected svn releases?
[12:52:35 CST(-0600)] <EricDalquist> https://github.com/Jasig/uPortal/blob/master/pom.xml#L1089
[12:52:37 CST(-0600)] <athena> oh ok, project-specific
[12:52:39 CST(-0600)] <EricDalquist> yeah
[16:45:23 CST(-0600)] * EricDalquist is loving guit
[16:45:24 CST(-0600)] <EricDalquist> git
[16:45:30 CST(-0600)] <EricDalquist> fixed a bug on our myuw branch
[16:45:40 CST(-0600)] <EricDalquist> "git checkout master" to switch to the main uPortal branch
[16:45:47 CST(-0600)] <EricDalquist> "git cherry-pick cf9d85f" to pull over the fix
[16:45:54 CST(-0600)] <EricDalquist> and then push to jasig/uPortal
[16:45:58 CST(-0600)] <EricDalquist> SO nice
[16:56:21 CST(-0600)] <athena> nice
[16:56:29 CST(-0600)] <athena> that's completely awesome
[16:56:42 CST(-0600)] <EricDalquist> yeah
[16:56:54 CST(-0600)] <EricDalquist> such a better way to do vendor branch work
[16:57:02 CST(-0600)] <athena> so does the master branch in the myuw fork always represent the clean vanilla trunk?
[16:57:35 CST(-0600)] <EricDalquist> well we only have one myuw specific branch
[16:57:39 CST(-0600)] <EricDalquist> at least right now
[16:57:53 CST(-0600)] <EricDalquist> we took the uportal-4.0.2 branch and forked off of that
[16:58:05 CST(-0600)] <EricDalquist> and have since merged the uportal-4.0.3 tag in
[16:58:22 CST(-0600)] <athena> gotcha
[16:58:29 CST(-0600)] <EricDalquist> the real question is what happens when I merge 4.0.4 since our myuw branch will have fixes that are also going to be in 4.0.4
[16:58:36 CST(-0600)] <athena> yeah
[16:58:41 CST(-0600)] <EricDalquist> is git smart enough to deal with that
[16:58:44 CST(-0600)] <EricDalquist> I'm betting it is
[16:58:47 CST(-0600)] <athena>
[17:05:31 CST(-0600)] <EricDalquist> does landis work for unicon?
[17:08:32 CST(-0600)] <holdorph> yes
[17:08:47 CST(-0600)] <EricDalquist> just curious