...
[16:22:40 CDT(-0500)] <EricDalquist> oi
[16:22:52 CDT(-0500)] <EricDalquist> sounds like I get to spend a day debugging that 
[16:22:56 CDT(-0500)] <athena>
[16:22:58 CDT(-0500)] <athena> no good.
[16:23:18 CDT(-0500)] <athena> yeah that's definitely the bizarre bug of the week . . .
[16:23:28 CDT(-0500)] <holdorph> it's only monday
[16:23:38 CDT(-0500)] <holdorph> do you realize what you're setting yourself up for saying that?
[16:24:26 CDT(-0500)] <EricDalquist> 
[16:25:12 CDT(-0500)] <EricDalquist> ok I think this is ready: https://wiki.jasig.org/display/UPC/Git+Tips+and+Tricks
[16:25:29 CDT(-0500)] <EricDalquist> I'll run through it all myself tomorrow to verify that
[16:25:52 CDT(-0500)] <EricDalquist> oh I need to add the "pull request" section
[16:27:43 CDT(-0500)] <athena> thanks so much for doing this
[16:27:49 CDT(-0500)] <EricDalquist> no problem
[16:27:55 CDT(-0500)] <athena> will have to try out the suggested branch strategy tomorrow
[16:28:01 CDT(-0500)] <EricDalquist> it will be valuable to have everyone on the same page
[16:28:03 CDT(-0500)] <athena> have to say that's a lot more steps than what we're used to doing
[16:28:12 CDT(-0500)] <EricDalquist> yes
[16:28:16 CDT(-0500)] <EricDalquist> though I'll add some more notes
[16:28:24 CDT(-0500)] <EricDalquist> since a bunch of them are "look at the commit logs"
[16:28:28 CDT(-0500)] <athena> yeah
[16:28:39 CDT(-0500)] <EricDalquist> and you may not need to do them most of the time
[16:28:44 CDT(-0500)] <athena> yeah
[16:28:45 CDT(-0500)] <athena> fair enough
[16:28:48 CDT(-0500)] <EricDalquist> since we don't have 20+ people constantly committing
[16:28:57 CDT(-0500)] <EricDalquist> also all of these do have eclipse equivalents
[16:29:03 CDT(-0500)] <athena> gotcha
[16:29:11 CDT(-0500)] <athena> i haven't succesfully made that work
[16:29:12 CDT(-0500)] <EricDalquist> I figure documenting the CLI is a good lowest common denominator
[16:29:16 CDT(-0500)] <athena> may have to go upgrade eclipse
[16:29:21 CDT(-0500)] <athena> yeah, it is
[16:29:49 CDT(-0500)] <EricDalquist> so as far as I can tell egit doesn't have any understanding of maven nested projects in eclipse
[16:30:01 CDT(-0500)] <EricDalquist> so you have to do all the Team commands on the root folder of the project
[16:30:13 CDT(-0500)] <EricDalquist> it has no idea that "uportal-war" is a git project
[16:30:16 CDT(-0500)] <EricDalquist>
[16:30:19 CDT(-0500)] <athena> ah.
[16:30:27 CDT(-0500)] <athena> then i guess it works as much as it ever will, in that case 
[16:30:34 CDT(-0500)] <athena> oh well
[16:30:42 CDT(-0500)] <EricDalquist> I guess the bigger problem is that eclipse still has no support for nested projects
[16:30:44 CDT(-0500)] <EricDalquist> which sucks
[16:30:46 CDT(-0500)] <athena> yeah.
[16:33:26 CDT(-0500)] <EricDalquist> ok I have to get going, catch you tomorrow
[16:34:33 CDT(-0500)] <athena> cya!
[16:34:36 CDT(-0500)] <athena> thanks for the help