singa-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] [incubator-singa] chrishkchris edited a comment on issue #488: SINGA -475 add Sign operator to singa
Date Fri, 09 Aug 2019 11:09:35 GMT
chrishkchris edited a comment on issue #488: SINGA -475 add Sign operator to singa
URL: https://github.com/apache/incubator-singa/pull/488#issuecomment-519876368
 
 
   there are conflicts and there are two solutions (same as what happened in log operator):

   1. merge this branch with the latest master
   2. checkout a new branch from the latest master. Then copy the added code into the autograd.py
and test_operations.py; send a new PR.
   
   (I guess this maybe because different PRs put the new functions 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:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message