Update Branching decisions?

cisco-ie / ie-git-guide

Innovation Edge's Git Guide: Zero to :100:

https://cisco-ie.github.io/ie-git-guide/

2 stars 0 forks source link

Update Branching decisions? #3

Closed remingtonc closed 7 years ago

remingtonc commented 7 years ago

So for our branching methodology going forward, are we using a development branch for feature branches that merges into master? Or are we expecting all feature branches to be stable at pull request and go straight into master?

ghost commented 7 years ago

Your issue doesn't follow our guidelines. Please fix the following:

Issue must have at least one label (?)
Issue title must be in imperative, present tense (e.g. "add", "fix", "change") (?)

Click here for details.

Thank you! :pray: _{This comment was made by GitMagic – Magically enforcing your contribution guidelines.}

ghost commented 7 years ago

This issue still violates some of our guidelines:

Issue title must be in imperative, present tense (e.g. "add", "fix", "change") (?)

Click here for details.

brh55 commented 7 years ago

@remingtonc @skkumaravel

Sprint + Feature Branch.

Sprint branch is created during start of sprint
Feature branch is created on start of sprint If feature branch completes --> Merge to Sprint Else feature branch continues to progress
If CI Passes && End of sprint: Sprint branch merges into Master

ghost commented 7 years ago

Thank you, everything looks good now! :bowtie:

remingtonc commented 7 years ago

@brh55 Requesting this is specified directly in guide.

brh55 commented 7 years ago

@remingtonc suggestions on where it should fit?

remingtonc commented 7 years ago

Directly before Required Readings section. Immediately jump in with a graphic/explanation.

brh55 commented 7 years ago

@remingtonc the readme now includes a full page scenario of a 2 sprint timeline.