Syntax

discard [-active|-head] [-colliding|-col] [-cip|-c] collision [activity]

Options

-active|-head

If given, the active version (head version) is discarded in favor of the colliding version.

-colliding|-col

If given, the colliding version is discarded in favor of the active version (head version).

-cip|-c

Checkout-in-place: creates an activity, does the discard and checks in the activity.

Arguments

collision

The collision that should be resolved by discarding one of the colliding versions.

activity

The path or name of the open activity that should be used for the discard.

Description

Resolves a collision by discarding one of the colliding versions.