HTHou commented on issue #450: modify documents URL: https://github.com/apache/incubator-iotdb/pull/450#issuecomment-544843023 > There are new conflicts, please have a look. Actually, I am still working on how to resolve these conflicts. I tried to copy everything except the file names from the initial files of Master branch, but Github still said there are conflicts. Do you think if I need to change the document and path names back to avoid the 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