cvandyck76 | 14 years ago | on: Understanding the Git Workflow
cvandyck76's comments
cvandyck76 | 14 years ago | on: Those 500K Bitcoins that caused the flash crash weren't real
Exactly. Security through obscurity does not work (for long, at least).
cvandyck76 | 15 years ago | on: Full Text RSS Feed: Get the whole feed and nothing but the feed
Is there an argument to be made that the content providers only get 'paid' if the RSS reader is enticed to click through to the site? I'm all for neat services, but I think that this is a little bit unfair to the other party.
page 1
Do normal feature development and bug fixes on the develop branch; save master for production releases. When it's time to make a release, cut a release branch (e.g. r/1.0.1) from the develop branch. Bug fixes that are made on that branch should also be merged into develop. Once the release is made, merge r/1.0.1 back into master and develop and continue on as normal.
Also see: https://github.com/nvie/gitflow