chrishkchris edited a comment on issue #487: SINGA -475 add Log operator to singa URL: https://github.com/apache/incubator-singa/pull/487#issuecomment-519882837 Yes, could pinpom please merge your branch with latest master branch, or send a new pr after copying the new codes. I guess this maybe because different PRs insert the new codes at the same line, so git detected it as different ways of changing code and hence conflicts.
---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
