[GitHub] eolivelli commented on issue #217: Issue 223: Code cleanups

[gi...@git.apache.org]

eolivelli commented on issue #217: Issue 223: Code cleanups
URL: https://github.com/apache/bookkeeper/pull/217#issuecomment-312602273
 
 
   Just issue a "git rebase master", this will be the output.
   Usually I am more comfortable with "git rebase master" instead of merging from master.
   We only merge with 'fast-forward" so that is the best procedure IMHO
   
   ```
   First, rewinding head to replay your work on top of it...
   Applying: Remove unnecessary semicolons
   Using index info to reconstruct a base tree...
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
   M	bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
   Falling back to patching base and 3-way merge...
   Auto-merging bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java
   Auto-merging bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
   Auto-merging bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
   Applying: Symplify if statements
   Applying: Use static member statically
   Applying: Remove unused/unneeded/duplicated imports
   Using index info to reconstruct a base tree...
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RoundRobinDistributionSchedule.java
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClient.java
   M	bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
   Falling back to patching base and 3-way merge...
   Auto-merging bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
   Auto-merging bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClient.java
   Auto-merging bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RoundRobinDistributionSchedule.java
   CONFLICT (content): Merge conflict in bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RoundRobinDistributionSchedule.java
   error: Failed to merge in the changes.
   Patch failed at 0004 Remove unused/unneeded/duplicated imports
   The copy of the patch that failed is found in: .git/rebase-apply/patch
   
   When you have resolved this problem, run "git rebase --continue".
   If you prefer to skip this patch, run "git rebase --skip" instead.
   To check out the original branch and stop rebasing, run "git rebase --abort".
   
   ```
 
----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services