[
https://issues.apache.org/jira/browse/HBASE-19057?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16214205#comment-16214205
]
Duo Zhang commented on HBASE-19057:
-----------------------------------
So what is a typical way of merging back a feature branch sir [~stack]?
Do a rebase and force push on the feature branch first? So that it can be
merged cleanly?
Thanks.
> Merge branch HBASE-18410 to master branch
> -----------------------------------------
>
> Key: HBASE-19057
> URL: https://issues.apache.org/jira/browse/HBASE-19057
> Project: HBase
> Issue Type: Sub-task
> Components: Filters
> Reporter: Zheng Hu
> Assignee: Zheng Hu
> Priority: Blocker
> Fix For: 2.0.0-alpha-4
>
> Attachments: HBASE-19057-HBASE-18410.v1.patch
>
>
> Open this issue to fix conflict , run HadoopQA and gather other feedback.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
