[
https://issues.apache.org/jira/browse/STORM-1885?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15347496#comment-15347496
]
ASF GitHub Bot commented on STORM-1885:
---------------------------------------
Github user HeartSaVioR commented on the issue:
https://github.com/apache/storm/pull/1468
We may have to modify lots of part of script since...
- We don't have develop branch so all about develop branch should be
modified. Spark merge script also doesn't have handling with develop branch
since they don't have develop branch, too. Maybe adopting spark script would be
easier than adopting kafka script.
- Branch policy is not compatible with projects which uses this script.
They have branches per version but we just maintain version lines (major,
minor, bugfix) so we should do something while determining fix versions from
merged branches.
- We're having master and 1.x / 1.0.x branches heavily diverged, so
there're often two or more pull requests submitted per one issue. (We don't
cherry-pick between master and 1.x for storm-core since it's easy to see merge
conflict.) It should be tested (at least unit test and integration test)
individually, and issue should be closed when all of pull requests are checked
in. It means that we're having different merging step which other projects
don't have.
- We should update CHANGELOG while merging step. Personally I don't like
updating CHANGELOG so opened thread for discussion but we didn't decide
something clearly.
- Commit message will contain body of pull request which is free format for
now and tends to be meaningless for commit message. We need to guide
contributor to write meaningful information. Thanks for Github we can have
[body template of the pull
request](https://github.com/blog/2111-issue-and-pull-request-templates) which
many projects have been using already.
So without arranging our branch policy and merging step, it will be hard to
get merge script fit for us.
> python script for squashing and merging prs
> -------------------------------------------
>
> Key: STORM-1885
> URL: https://issues.apache.org/jira/browse/STORM-1885
> Project: Apache Storm
> Issue Type: Task
> Reporter: Sriharsha Chintalapani
> Assignee: Sriharsha Chintalapani
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
