1

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.

Machavity
  • 30,841
  • 27
  • 92
  • 100
AIB
  • 5,894
  • 8
  • 30
  • 36

1 Answers1

2

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).
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • You have another example at https://jazz.net/forum/questions/132555/scm-accept-can-not-detect-the-deleted-directoriesfiles – VonC May 14 '14 at 19:57