Branch Strategy - Githubissues

jasonleonhard / gyfted

Gyfted (pronounced gift-ed) Like Lyft for improving peoples lives that need it most

1 stars 1 forks source link

Branch Strategy #10

Open williamsmichael opened 6 years ago

williamsmichael commented 6 years ago

Pull down the master branch live
Create dev branches
Switch to dev branch
Small, clear, concise commits (ease of investigation and demonstrates your work regardless if it is incorporated into the final product)
Switch master origin
Pull down the master live branch
Switch to dev branch
Merge master origin to dev branch
Resolve conflicts
Push to master origin or live

jasonleonhard commented 6 years ago

Thank you for adding this as we discussed.

jasonleonhard commented 6 years ago

This can be added to the readme or /docs

williamsmichael commented 6 years ago

from the sprint 2 retrospective, the group will disregard pull requests unless the request is for a peer review. the steps have been updated above. If there is not any disagreement on these steps to move forward, we can close this issue.