cshannon commented on PR #3510: URL: https://github.com/apache/accumulo/pull/3510#issuecomment-1601596262
> Looks like there are test failures anyway. Not sure if those are merge artifacts or implementation issues. In any case, in future scenarios like this, I recommend just merging forward the other commit with `-s ours`, and then creating a new PR to reimplement the equivalent changes in the new branch that requires re-review. That way, it can just be squash-merged directly when it's ready. Yeah it was from the extra validation commit. I actually realized when you were posting that merging this would break things with the extra merge commit. I mostly had just wanted Dave to take a look at it to make sure it was good. In this case I did merge using -X ours and I ended up fixing things in the merge but next time I'll just do the fix in another PR after the merge. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
