RTC equivalent for 'git pull'

Question

What is the equivalent command for accomplishing the use case of a git pull command (update to the tip and do auto resolve conflicts) ? I'm looking for the scm command which accomplishes the functionality of a git pull operation.

Answer 1

That would be, as shown in accept example a:

lscm show status
lscm accept changesetId

That is using:

• The lscm show status command to list the incoming change sets,
• The lscm accept command will integrate a change set from astream into your repo and local workspace, and make automatic merge (unless there is conflicts or unless you specify --no-merge).