elasticsearch/elasticsearch — Issue #1528: Consider merging release branch commits into master
Author: erickt
Created: 2011-12-09 01:06:03+00:00
State: open

When exploring elasticsearch's master branch, it can be a little difficult to separate out the commits cherry picked from the release branch from the commits unique to the master branch. Instead of cherry-picking commits onto master, could the release commits be merged instead?

There's an even more elaborate version of this branching strategy called [git flow](http://nvie.com/posts/a-successful-git-branching-model). That link explains this merging strategy a bit more, and fleshes things out into a full release management cycle. There's even a [git plugin](https://github.com/nvie/gitflow) for it too.