Add @SuppressModernizer #86
Conversation
|
@stevegutz This seems like a better approach than #74; thank you for reworking this! Could you resolve the conflicts and remove some of the whitespace changes before we continue? |
|
Fixed whitespace, addressed merge conflicts, updated readme, and sorted out the checkstyle dependency mess. |
|
GitHub still reports conflicts; please squash these and then run: |
| @@ -0,0 +1,119 @@ | |||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | |||
There was a problem hiding this comment.
Did you create this via git mv? It doesn't seem to retain the history.
There was a problem hiding this comment.
This is a known github issue: isaacs/github#900
|
I'm not seeing any conflicts: screenshot. Perhaps you need to hard refresh the page? |
|
I still see conflicts:
Could you also squash the commits? |
64a78e4 to
52922d5
Compare
52922d5 to
ba80198
Compare
|
Rebased and squashed. It was showing the merge conflicts because you're looking to rebase and merge. There was seemingly no way for them to be visible to me. It might be helpful for you to add a PR template so that contributors are aware of your expectations w/r/t the commit history. |
|
Thank you for your contribution @stevegutz! This was a much-requested feature and I appreciate the extra effort to rework the implementation. I pushed 1.8.0-SNAPSHOT and will hope to push 1.8.0 release in a few days. |
|
✨ |
This add
@SuppressModernizerto fix #3. I can update the docs once this approach is approved.@gaul
cc @jhaber @kmclarnon