davisp commented on issue #567: Import couchdb setup URL: https://github.com/apache/couchdb/pull/567#issuecomment-315841170 +1 Look fine to me. Though you'll want to update rebar.config.script after you merge this. As to the conflicts notice it sure would be nice to know what GitHub thinks is in conflict. Assuming it applies cleanly locally I'd just do that and call it good. It could even be that GitHub thinks its a conflict precisely because they have separate roots. ---------------------------------------------------------------- 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: [email protected]
With regards, Apache Git Services
