samperson1997 commented on issue #306: Directory name changed, but document didn't change URL: https://github.com/apache/incubator-iotdb/pull/306#issuecomment-515419874 Hi, there are some others' commits and changed files mixed in this PR during your conflict solving. You can simply reset and stage the changes in this PR, and use git pull --rebase xxx command to pull and rebase on the latest codes. Then by unstaging and force pushing, there will only be your own changes in this PR :-)
---------------------------------------------------------------- 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
