[GitHub] michael-o commented on issue #4: [MJAVADOC-527] - detectLinks may pass invalid urls to javadoc

[GitBox <gi...@apache.org>]

michael-o commented on issue #4: [MJAVADOC-527] - detectLinks may pass invalid urls to javadoc
URL: https://github.com/apache/maven-javadoc-plugin/pull/4#issuecomment-450820038
 
 
   Something is still fishy about this:
   
       mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/maven-javadoc-plugin (PR_MJAVADOC-527)
       $ git rebase master
       First, rewinding head to replay your work on top of it...
       Applying: [MJAVADOC-527] - detectLinks may pass invalid urls to javadoc
       .git/rebase-apply/patch:68: trailing whitespace.
       
       warning: 1 line adds whitespace errors.
       error: Failed to merge in the changes.
       Using index info to reconstruct a base tree...
       M       src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
       Falling back to patching base and 3-way merge...
       Auto-merging src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
       CONFLICT (content): Merge conflict in src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
       Patch failed at 0001 [MJAVADOC-527] - detectLinks may pass invalid urls to javadoc
       The copy of the patch that failed is found in: .git/rebase-apply/patch
       
       Resolve all conflicts manually, mark them as resolved with
       "git add/rm <conflicted_files>", then run "git rebase --continue".
       You can instead skip this commit: run "git rebase --skip".
       To abort and get back to the state before "git rebase", run "git rebase --abort".
   
   Can you please check again?
   

----------------------------------------------------------------
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