xforty / vagrant-drupal

Template repo for a new drupal project built on top of a vagrant vm.
Other
46 stars 11 forks source link

Create a changelog for 0.2.0 #37

Closed dkingofpa closed 12 years ago

dkingofpa commented 12 years ago

Probably just a Changelog text file? Maybe not. Haven't decided yet.

pearcec commented 12 years ago

Do we merge all of this into master then work on 0.3.0 off of develop?

dkingofpa commented 12 years ago

With git flow, I think we can create a release branch for 0.2.0. After which, we can keep committing post-0.2.0 code to the develop branch. Any changes that are added to the 0.2.0 release branch will automatically get merged back in to develop when the release branch is closed. To be safe though, you can always use feature branches to avoid having to commit to develop.

I think this is how it would work.