I think that should be fine. My only concern is huge merges that you'd have to do every time you want to push new release.
Thanks, Ilya Volodin On Sunday, November 10, 2013 2:59:25 PM UTC-5, Nicholas Zakas wrote: > Hi all, > > I'm considering a new branching scheme for ESLint and would like some > feedback. > > Problem: Currently, all releases are done off of the master branch, which > means the version number in package.json is always (something)-dev. This > last week, I wanted to push out a minor release to fix a bug (v0.1.1). In > order to do that, I would have had to change the package.json version to > v0.1.1 from v0.2.0-dev, push the release, make a tag for v0.1.1, then > change package.json back to v0.2.0-dev. This becomes a hairy mess if I want > to do other point releases in between the planned ones. > > Possible solution: Maintain a release branch in addition to master. The > master branch always has a version number of (something)-dev for the next > scheduled release. The release branch always has a version number equal to > the last published ESLint version. When it comes time for a release, the > master branch is rebased onto the release branch. So the master branch > continues to have ongoing development and the release branch is updated > only periodically. That also means all version tags will be in the release > branch and only the release branch will have changelog updates. > > Thoughts or other solutions? > > -- > > ______________________________ > Nicholas C. Zakas > @slicknet > > Author, Professional JavaScript for Web Developers > Buy it at Amazon.com: > http://www.amazon.com/Professional-JavaScript-Developers-Nicholas-Zakas/dp/1118026691/ref=sr_1_3 > > -- You received this message because you are subscribed to the Google Groups "ESLint" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
