You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/11/04 15:26:59 UTC

[GitHub] matthiasblaesing commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions

matthiasblaesing commented on issue #225: [NETBEANS-54] exclude .ser files via Rat exclusions
URL: https://github.com/apache/incubator-netbeans/pull/225#issuecomment-341905492
 
 
   To resolve the conflict I suggest that you:
   - rebase the changes onto master
   - resolve the conflict while rebasing
   - push the updated branch (you'll need to do a forced-push to be able to push a rebased branch)

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