fluid-work IRC Logs-2011-10-24
[13:37:37 CDT(-0500)] <EricDalquist> anyone have a few minutes to chat about git workflows?
[13:39:55 CDT(-0500)] <anastasiac> EricDalquist, I'm not the local expert, but I'm happy to chat
[13:40:14 CDT(-0500)] <EricDalquist> just curious how various fluid committers work
[13:40:29 CDT(-0500)] <EricDalquist> do you each clone the main repository and just push directly to it?
[13:40:38 CDT(-0500)] <EricDalquist> or do you have personal forks?
[13:41:05 CDT(-0500)] <EricDalquist> and if you have personal forks what is the workflow like for getting changes merged back into the main repository?
[13:41:26 CDT(-0500)] <anastasiac> we create personal forks, and we tend to work in a branch of our own fork, then submit a pull request to the main repository. This makes it easy to work code reviews into the workflow
[13:42:01 CDT(-0500)] <anastasiac> we started working this way during bug parade only, but it worked really well, so we're considering implementing it as the main workflow
[13:43:28 CDT(-0500)] <EricDalquist> so on https://github.com/fluid-project/infusion/commits/master I see messages like "https://github.com/fluid-project/infusion/commit/cac9b6a586e516b645a7d9da443062428821ddc5...."
[13:43:49 CDT(-0500)] <EricDalquist> are you merging back into the main repository directly from your fork without a pull request for that?
[13:44:34 CDT(-0500)] <anastasiac> no, there was a pull request for it: https://github.com/fluid-project/infusion/pull/188
[13:44:44 CDT(-0500)] <anastasiac> it seems that the commit doesn't reflect that
[13:44:46 CDT(-0500)] <anastasiac> interesting
[13:44:48 CDT(-0500)] <EricDalquist> ah ok
[13:45:37 CDT(-0500)] <EricDalquist> so in fluid's model no one ever merges their own work, it is always up to someone else to merge the pull request
[13:46:23 CDT(-0500)] <anastasiac> yes, that's the way we're working now. It ensures that code gets reviewed, especially in cases where we're not pairing as much as we'd like to
[13:46:46 CDT(-0500)] <anastasiac> often, there's some back and forth on a pull request based on the review, and it gets revised before it's merged
[13:47:08 CDT(-0500)] <anastasiac> working in branches also allows us to name the branch after the JIRA issue it's related to
[13:47:14 CDT(-0500)] <anastasiac> it helps keep track of why work is done
[13:47:33 CDT(-0500)] <anastasiac> michelled is fond of the network graphs https://github.com/fluid-project/infusion/network
[13:49:12 CDT(-0500)] <EricDalquist>
[13:49:32 CDT(-0500)] <EricDalquist> and are you using the rebase approach or just merging master into the branch before doing the pull request?
[13:49:58 CDT(-0500)] <anastasiac> I suspect that's up to individual developers, but I think most people just merge master into their branch. That's what I do.
[13:50:06 CDT(-0500)] <EricDalquist> ok
[13:50:22 CDT(-0500)] <EricDalquist> does fluid as a project have any documentation on the git workflow we could crib from?
[13:52:00 CDT(-0500)] <anastasiac> we're still working out the actual workflow, but we do have a few pages with tips: http://wiki.fluidproject.org/display/fluid/GIT+Tips+and+Tricks and http://wiki.fluidproject.org/display/fluid/Github+Tips+and+Tricks
[13:52:10 CDT(-0500)] <EricDalquist> wonderful
[13:52:19 CDT(-0500)] <EricDalquist> we just moved uPortal to GitHub last Thursday
[13:52:26 CDT(-0500)] <anastasiac> you'll love it
[13:52:27 CDT(-0500)] <EricDalquist> and I'm trying to get workflow documentation put together for developers
[13:52:33 CDT(-0500)] <EricDalquist> yeah
[13:52:35 CDT(-0500)] <EricDalquist> I already do
[13:52:45 CDT(-0500)] <EricDalquist> its just a big paradigm shift from svn
[13:52:53 CDT(-0500)] <anastasiac> your community will probably work out their own workflow as they go
[13:52:53 CDT(-0500)] <EricDalquist> so I need to provide help to those that are new to git
[13:52:57 CDT(-0500)] <EricDalquist> yup
[13:53:07 CDT(-0500)] <anastasiac> there's a link to a "primer" on one of those pages
[13:53:10 CDT(-0500)] <anastasiac> I still refer to it sometimes
[13:53:16 CDT(-0500)] <EricDalquist> as much as we would like to just do pull requests we don't have the resources to do that kind of code review
[13:53:20 CDT(-0500)] <anastasiac> Justin_o put it together to teach us all
[13:53:27 CDT(-0500)] <EricDalquist> great
[13:53:49 CDT(-0500)] <anastasiac> yeah, we do find that the pull request can slow things down, as the reviewer becomes a bottleneck
[13:53:51 CDT(-0500)] <anastasiac> soemtimes
[13:57:57 CDT(-0500)] <EricDalquist> thanks for all the info