girldevelopit / gdi-website

This is the official repository for the Girl Develop It website.
https://girldevelopit.com
MIT License
310 stars 378 forks source link

PR to staging branch #566

Closed brendajin closed 7 years ago

brendajin commented 7 years ago

@kstack7 does that look right to you now?

kstack7 commented 7 years ago

@brendajin hmmm seems like we're merging back production commits into staging...probably because of your production branch matching origin production? Any way you can do a fresh pull of staging and applying a new branch so we don't loop commits back into staging? More of a nit-pick for sure, but keeps the commit history cleaner. Happy to hear suggestions or counters :P :)

brendajin commented 7 years ago

Sorry, not used to this workflow. Let me try again.

kstack7 commented 7 years ago

@brendajin it's all good! Your code changes would have been pretty straight-forward and safe to apply directly to production, but we're maintaining this staging > production flow for now. Usually more handy for more complex changes so I'm feeling a tad nit-picky for that reason :P I appreciate your help!

kstack7 commented 7 years ago

Thanks again 👍