jira-importer commented on issue #335: URL: https://github.com/apache/maven-scm/issues/335#issuecomment-2964586314
**[Giovanni Pedone](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=iosonogio)** commented The merge param is used also on the **first checkout**. Anyway, this doesnt matter that much, since when you first checkout a project, the working folder is empty ;-) The issue arises when you do subsequent builds, then it is used the -merge option. This option means that if some file has changes on ST server and that same file has been changed in the local working directory, it will get merged automatically and without prompting. Even though this situation would be **not** normal to happen, since no one should be supposed to go into Continuum working folder and modify any files, it is conceptually wrong to my opinion. As I said, Continuum should not be given the authority to merge files, since.conflicts may happen that may not be able to get automatically resolved. Please tell me if all this is wrong. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
