cvandyck76
Re:Understanding the Git Workflow
on Sunday July 31, 2011 @01:53PM (#2828980)
I wouldn't have two separate branches for bugfixes and then one for new features - as you noted, it can get hairy. Personally I find the git-flow model very straightforward.
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
Re:Those 500K Bitcoins that caused the flash crash weren't real
on Friday July 01, 2011 @02:10AM (#2717221)
Exactly. Security through obscurity does not work (for long, at least).
Re:Full Text RSS Feed: Get the whole feed and nothing but the feed
on Tuesday March 01, 2011 @11:41PM (#2278476)
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.