sijie commented on issue #217: Issue 223: Code cleanups URL: https://github.com/apache/bookkeeper/pull/217#issuecomment-312648742 Re ""This branch cannot be rebased due to conflicts"" What should I do to fix it? I don't think you need to rebase your pull request. When we merge the pull request, we do a squash merge with https://github.com/apache/bookkeeper/blob/master/dev/bk-merge-pr.py Per BP-9, we want 'squash merge' not 'rebase and merge'? @jiazhai any thoughts? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
With regards, Apache Git Services
