[ 
https://issues.apache.org/jira/browse/SCM-117?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17960147#comment-17960147
 ] 

ASF GitHub Bot commented on SCM-117:
------------------------------------

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.
   




> Add parameters to scm configuration element
> -------------------------------------------
>
>                 Key: SCM-117
>                 URL: https://issues.apache.org/jira/browse/SCM-117
>             Project: Maven SCM (Moved to GitHub Issues)
>          Issue Type: Wish
>          Components: maven-scm-provider-starteam
>    Affects Versions: 1.0-beta-2
>            Reporter: Aviran
>            Assignee: Dan Tran
>            Priority: Major
>
> It would be very nice to have the ability to add parameters to the scm 
> element. For instance to add parameter to always force checkout. for instance 
> in Starteam I would like to add -o so every time stcmd is called the 
> parameters will be concatenated to the command line



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

Reply via email to