Add Conflicts With Deferred Rename Dialog Box

See Also   Tasks

Use this dialog box to resolve a situation that is interfering with adding items to source control. The items you renamed locally were not renamed on the source control server (the renaming action was deferred). These renamed items have the same names as  the items you are trying to add now.

Options

Items

Displays a list of the items that are in conflict with your current action. These items were renamed locally, but not renamed on the source control server. The source control database names for these items match the names of the items you are trying to add to the source control server.

Push Rename

Renames the source control server items to match the list in the Items box. Afterward, you will be prompted to continue with your original action to add items.

Allow Conflict

Proceeds with the source control action, which may overwrite or change the items on the source control server. These items are listed by their local names in the Items box. This action ignores any delayed actions that were not pushed to the server. Also, since you are ignoring this delayed action, the development environment will no longer keep a record of it.