You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2019/08/01 17:57:36 UTC

[GitHub] [incubator-druid] leventov commented on issue #8138: Add SuppressWarnings SS_SHOULD_BE_STATIC

leventov commented on issue #8138: Add SuppressWarnings SS_SHOULD_BE_STATIC
URL: https://github.com/apache/incubator-druid/pull/8138#issuecomment-517393957
 
 
   You need to merge master into your branch, not rebase. I usually do it as follows:
   ```
   $ git fetch upstream master
   $ git merge upstream/master
   ```
   And then resolve conflicts.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org