Note for reader: This may be only related to committer/PMCs. Hi,
We recently changed our master to 2.0.0-SNAPSHOT and make 1.x-branch. Everything except "removing docs" is same between master and 1.x-branch but now it is diverged. New PR which is based on commit after "removing docs" can't be "merged" to 1.x-branch via "git merge" cause it also merges excluded commits. (For example, https://github.com/apache/storm/pull/1024) I'm curious which is convenient way maintaining 1.x-branch or 2.x-branch. If we decide to maintain 1.x-branch, it could be a pain if we need to merge many pull requests for 0.x / 1.x after diverged. What do you think? For now I'm waiting for decision before backporting STORM-1482 <https://issues.apache.org/jira/browse/STORM-1482> to 1.x-branch. It's already pushed to master, but I can't decide how to backport it to 1.x-branch. Cherry-picking would what we want? Thanks, Jungtaek Lim (HeartSaVioR)
