Hi yyfearth,
> and the previous '<<<<' problem i still cannot solve since both local and remote repo is clean
This is how git works. If there is a merge conflict, git adds the markers. You cannot expect that the platform automatically copes with merge conflicts. What you can do is prevent merge conflicts.
To understand the conflict, let me explain:
There are three repositories involved.
1. Your local repo (on your local machine)
Conflicts happen when two parties change the same file at the same location. I this case, some file got changed on the VM. This could be through your app (log files, uploaded files,..) or through npm (package.json, cloudnode npm install). If the same file is pushed through git both repos 1. + 2. are clean, but when the change lands in repo 3 there is a conflict in your VM (local change vs. git) and git inserts the conflict markers. If that code is executed by node, it gives the parsing error.
Please follow these rules:
1. Don't push npm modules using git, use npm (package.json or cloudnode npm install)
2. Don't push log files or other files that are actively changed by your application.
- Hans