search

wbuchanan / sdpConvening2017

Repository for Strategic Data Project 2017 Convening Session Proposal on Collaborative Coding Practices
https://wbuchanan.github.io/sdpConvening2017
4 stars 12 forks source link

Committing to Master Branch #5

Closed wbuchanan closed 7 years ago

wbuchanan commented 7 years ago

@nathant23, @daphnejenkins, & @jsonbecker,

How do we want to handle pushing things into master? Should we go with a more typical/traditional approach (e.g., create feature branches, set up some general process for code review, and then merge the PR) or something else?

wbuchanan commented 7 years ago

@jsonbecker,

Would this be a topic that you were thinking about addressing a bit more in your part of the session? If so I'm fine with going with whatever merge strategy you want to use for things and if not I can try working this into my part of things if it isn't going to be covered by anyone else.

jsonbecker commented 7 years ago

I think ideally we should go feature branch with a PR to master with one review required to get merged in.

-- Jason Becker

On Apr 30, 2017, 10:00 AM -0400, William Buchanan notifications@github.com, wrote:

@jsonbecker (https://github.com/jsonbecker),

Would this be a topic that you were thinking about addressing a bit more in your part of the session? If so I'm fine with going with whatever merge strategy you want to use for things and if not I can try working this into my part of things if it isn't going to be covered by anyone else.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub (https://github.com/wbuchanan/sdpConvening2017/issues/5#issuecomment-298234031), or mute the thread (https://github.com/notifications/unsubscribe-auth/ABQNOAD47y2gZ8hbZDJQob-i8MhuHIQwks5r1JPigaJpZM4M4ApE).

wbuchanan commented 7 years ago

@jsonbecker

That works for me. I submitted a PR for the session proposal and tagged @nathant23 to review. I imagine we'll get several different PRs targeting the prework branch as people start completing and figured it might create some merge conflicts that we could use to talk about managing collaborative workflows and/or product management type issues.