Popping this out of JIRA since I am changing the subject somewhat. Christopher (or anyone, really): Can you give me an example of doing a merge with -sours but only with specific commits, as recommended? It makes sense that this is safer vs. sweeping in HEAD. Just trying to refine my workflow. Thanks!
Bill ---------- Forwarded message ---------- From: Christopher Tubbs (JIRA) <[email protected]> Date: Wed, Feb 19, 2014 at 2:36 PM Subject: [jira] [Commented] (ACCUMULO-1961) Fix trivial compiler/javadoc warnings To: [email protected] [ https://issues.apache.org/jira/browse/ACCUMULO-1961?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13905940#comment-13905940] Christopher Tubbs commented on ACCUMULO-1961: --------------------------------------------- It looks like you are right. Be careful about -sours. You should probably only use that with specific commits, not the HEAD of the branch, which could reference multiple commits. Don't worry about fixing it. I'll redo. There's some other javadoc errors/warnings and other trivial warnings in master that need to be fixed anyway.
