search

AgileVentures / agile-ventures-website-react-front-end

React Front End for the AgileVentures site
4 stars 13 forks source link

Organize the workflow #35

Open FedericoEsparza opened 5 years ago

FedericoEsparza commented 5 years ago

Organize the workflow.

@FedericoEsparza needs to update develop, staging, and master branches so that new tickets/PRs can branch off of up-to-date code, off of develop, in order to keep the rest of the team and newcomers from merge conflict hell.

Kachulio1 commented 5 years ago

I'm not clear about this, could you explain in more detail?

FedericoEsparza commented 5 years ago

@Kachulio1 I hope it is CRYSTAL CLEAR after our session. But you knew all this!

Kachulio1 commented 5 years ago

cool, update master and staging so I can approve/finish this ticket.

FedericoEsparza commented 5 years ago

@Kachulio1 Will do, and, I mean, I could just "update" them. That's not the hard part. The hard part is getting them clean, (as they are conveniently nested in the thickest part of our current code divergence), Screen Shot 2018-12-13 at 6.45.53 PM.png AND working through all of the current merge conflicts to get to that point, while triaging the path with least pain, from the branch leafs where @dkuku has work, and the couple of branch leaves where you and @mattwr18 have ended up, so as to make all the work you have all put in not go to waste, while not leaving it to you to figure out, and not throwing a big workload onto @tansaku

I think @dkuku was polite, but clear, in our session today, about all the extra work he's having to do, and how he is in consistently in merge conflict messes. So this is my highest priority.

That's also why I was a little proactive in closing @mattwr18 's PR, so that the 48 files changed in that PR wouldn't distract me as I work on this ticket.

You guys are all doing great work, so I'm just trying to gently steer us into an organized workflow with clean & up-to-date protected branches, all while not slowing you down (because we have the Christmas deadline), and while shielding you and Sam from a few Project Management headaches and work.

I could leave you all to fend for yourselves, but I'd rather be nice, and helpful, while hopefully being only slightly assertive about the project management style that I prefer. Feel free to run me over, and take over if you're not happy! You've put in more hours than @joaopapereira and I have put in to the Anvil project. But if you did run me over, I'm afraid I'd be ran over and discouraged, myself. 🙂

I've kept up fairly ok with all of the work on the updated branches that you all are pushing up regularly (including Daniel's forked repo), so I have the project and its state decently loaded into my brain. However, you guys are working at break-neck speed, and are starting to let your test coverage dip low in the projectsList, where you are now (I'm very pleased with your tests in most of the other components), AND I only started working on this ticket this Tuesday during the #daily-code-kickoff, with Daniel and Nico, so I think I'll try to be helpful and methodical, and not bite the bullet, by only "updating" the default branches, so as to save myself and you guys from the merge conflict discouragement that is sure to be on the other side.

I'll try my best to make it easier for the team, instead, by getting us to and updated state where your current work can easily be merged.

Sorry for the blog post 😁, but I hope this clears up a few things about my approach. I don't like to give you guys a hard time, for no good reason 😁

Have you heard of the Anvil project? That repo is so clean, that it has no code in it. It'll be nice to start fresh from there, with a proper workflow and a test suite we can cheat off of, in order to avoid this type of issue, as we TDD it into an awesome redesigned frontend!