[
https://issues.apache.org/jira/browse/ACCUMULO-1961?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13905994#comment-13905994
]
Mike Drob commented on ACCUMULO-1961:
-------------------------------------
[~ctubbsii] - If [~bhavanki] had committed his changes (e.g. into
1.5.1-SNAPSHOT) after you committed yours, but you did not merge your changes
up to the next branch (1.6.0) then he has no way to just merge his work and not
yours. He'd have to do a cherry pick of his own work up, which I don't think is
a sustainable workflow. I'm not sure what exactly happened, so it's hard to
comment, but the general answer is to just always merge your own changes up! :)
> Fix trivial compiler/javadoc warnings
> -------------------------------------
>
> Key: ACCUMULO-1961
> URL: https://issues.apache.org/jira/browse/ACCUMULO-1961
> Project: Accumulo
> Issue Type: Task
> Affects Versions: 1.4.4, 1.5.0
> Reporter: Christopher Tubbs
> Assignee: Christopher Tubbs
> Priority: Trivial
> Fix For: 1.4.5, 1.5.1, 1.6.0
>
>
> Clean up trivial 1.6 compiler/javadoc warnings across all versions currently
> in development.
--
This message was sent by Atlassian JIRA
(v6.1.5#6160)
