2015-12-03 23:07:55 +0000 <chreekat> Here, check out my current work, in this dummy "MR" between branches in my repo: https://git.gnu.io/chreekat/snowdrift/merge_requests/1
2015-12-03 23:08:54 +0000 <chreekat> new-home-and-intro is not what's going to go live. It is a bunch of work that will get added to the work I'm doing there
2015-12-03 23:08:56 +0000 <montanonic> chreekat: Handler/Comment.hs
2015-12-03 23:08:57 +0000 <wolftune> chreekat: how did you open a MR to something not master?
2015-12-03 23:09:14 +0000 <montanonic> A monolithic file if I've ever seen one. yuck
2015-12-03 23:09:24 +0000 <chreekat> montanonic: hot diggity wowsers
2015-12-03 23:09:30 +0000 <wolftune> montanonic: :)
2015-12-03 23:09:32 +0000 <chreekat> montanonic: looking forward to the MR
2015-12-03 23:09:47 +0000 <chreekat> wolftune: I don't know, that's all within my own git.gnu.io/chreekat/snowdrift
2015-12-03 23:09:54 +0000 <chreekat> not the "real" snowdrift repo
2015-12-03 23:10:01 +0000 <chreekat> there was a "choose branches" button
2015-12-03 23:10:17 +0000mlncn(~quassel@50.250.6.141)
2015-12-03 23:10:38 +0000 <chreekat> wolftune: Ok, one thing unclear is that I expected a 1-way flow
2015-12-03 23:10:41 +0000 <chreekat> mray -> jazzy -> me
2015-12-03 23:11:04 +0000 <chreekat> From my perspective the collaboration went off smashingly
2015-12-03 23:11:26 +0000 <wolftune> smashingly as in "lots of things got smashed" ?
2015-12-03 23:11:32 +0000 <chreekat> As in, everything is going according to [my] plan
2015-12-03 23:11:41 +0000 <wolftune> um, no it isn't
2015-12-03 23:11:48 +0000 <chreekat> but it is
2015-12-03 23:11:57 +0000 <wolftune> JazzyEagle changed things that mray wouldn't want changed
2015-12-03 23:12:23 +0000 <wolftune> or rather, mray wasn't 100% solid on his work before JazzyEagle did things
2015-12-03 23:12:24 +0000 <chreekat> Obviously. There's no specs.
2015-12-03 23:12:55 +0000 <wolftune> well, specs are nice, but it's still totally feasible for people to collaborate back and forth
2015-12-03 23:13:36 +0000mlncn(~quassel@50.250.6.141) (Client Quit)
2015-12-03 23:13:55 +0000 <mray> won't this be sorted out more quickly face to face?
2015-12-03 23:13:58 +0000mlncn(~quassel@50.250.6.141)
2015-12-03 23:14:10 +0000 <wolftune> maybe
2015-12-03 23:15:21 +0000 <chreekat> wolftune: there are extenuating circumstances in this case. new-home-and-intro cannot be merged to master as is. There is a critical path that goes through my current work.
2015-12-03 23:15:38 +0000 <wolftune> chreekat: think about this: for me testing the mockup, seeing where a link goes and how it works is relevant to thinking about things, mockups can be part of the design iterations
2015-12-03 23:16:19 +0000 <chreekat> The way I see it, jazzy is working on a piece of my work. Wait until I'm done, and I have his stuff included, and then we can easily collaborate and go back and forth
2015-12-03 23:16:21 +0000 <wolftune> so, say JazzyEagle does the work of making some links operate, then I check it out and have design feedback, so the idea is for mray to then address the concerns in the design
2015-12-03 23:16:43 +0000 <wolftune> and it makes sense for mray to be able to play with the updated working code as he continues his work..
2015-12-03 23:17:49 +0000 <mray> i'm so glad that git isn't only confusing when i have to deal with it...
2015-12-03 23:19:32 +0000 <chreekat> Ok maybe here is a point of confusion. Everything you're saying makes sense, but it does not make sense to say "Ok jazzy, pass off responsibility on this back to mray". At this point jazzy owns the page. mray can provide critiques, but that doesn't require responsibility transfer
2015-12-03 23:20:22 +0000 <chreekat> I don't know, I've lost sight of what we are deciding upon or whatever