kinow commented on pull request #191:
URL: https://github.com/apache/commons-csv/pull/191#issuecomment-951323570


   @rvesse I took the liberty to rebase and push to your branch, hope that's 
OK. Take a look to confirm your change is still OK, please.
   
   The conflicts were created in the post-release commits to `master`. I think 
GitHub UI only shows that there are conflicts, but the diff view only shows the 
difference between your change and the old commit in `master` (where your 
change could be applied cleanly with no conflicts). A bit confusing I think.


-- 
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: issues-unsubscr...@commons.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Reply via email to