Go Resolve Team Foundation Version Control conflicts

This article transferred from: http://msdn.microsoft.com/en-us/library/ms181432.aspx

An advantage of using Team Foundation version control to manage your files is the several people can work concurrently on A file. One drawback is this sometimes you must resolve conflicts before can get, check in, unshelve, merge, or roll back your Files.

Although it can frustrating to encounter conflicts, the system provides information and tools to help you understand an D Resolve conflicts.

• Resolve conflicts

• AutoResolve All conflicts

• AutoMerge an individual conflict

• Manually resolve an individual conflict

• Understand the automatic options

• Work from the command prompt

• Get Tips

Resolve Conflicts

Use the Resolve Conflicts window to Resolve Conflicts that is blocking you.

By default, the window shows only the conflicts caused by the most recent operation you attempted. When the window was in this state, a message appears that begins: Path filter applied.  To show all conflicts in your workspace, choose Get all conflicts. A message that is begins with: n Conflict (s) appears.

If a lot of time had passed since you made changes to the files in your workspace, new conflicts might had occurred. to refresh the Resolve Conflicts window, choose Refresh.

Each conflict contains information and sometimes links the might help you resolve it. To get more information, you can select the conflict and choose:

• The history of the file. If the operation that caused the conflict is a Merge or a Rollback and then you can choose the menu control to the right of the C2>history and then select either Source, History, or Target history.

  See Get The history of an item.

• annotate to view details on all changes this were made to the most recent version of the file, including who made each Change and when they made it. See View file changes using annotate.

• Compare (or the menu to the right of the button and then choose a command). The Diff window appears.

autoresolve All Conflicts

By default, the system automatically attempts to autoresolve all conflicts unless you have turned off this option (see Tips). In the Resolve Conflicts window, you can also manually choose autoresolve All, and then choose:

• Select all Conflict Types If your want the system to attempt to resolve the conflicts automatically by using the all its he Uristics.

• Select Specific Conflict Types If you want the system to attempt to resolve the conflicts, but you want to exclude SOM E heuristics.

  The Choose Conflicts to Resolve dialog box appears. Check or clear the options, want to enable or disable, and then choose autoresolve. For more information, see Understand the automatic options below.

The system attempts to automatically resolve the conflicts displayed in the Pending Changes window. Any conflicts the system is unable to resolve would remain in the window. You has to manually resolve these conflicts.

automerge a single conflict

Choose AutoMerge If you want to try to resolve selected conflicts using all the AutoMerge options described in Underst And the automatic options below.

Tip
You can press and hold either the Ctrl or the Shift key and then select multiple conflicts.

Note
If AutoMerge is disabled, then this conflict must be manually resolved.

manually resolve a single conflict

If the system cannot automatically resolve a conflict, or if you want to make sure are understand what are changing, you mu St manually resolve the conflict. Within each conflict, the system displays the actions so can take to resolve the conflict. The actions displayed depend upon the conflict type, and the operation that caused the conflict.

Merge changes in merge tool

When a conflict was caused by the conflicting content changes, you can choose the merge changes in merge Tool.

When you choose this action, the Merge window appears.

The outcome of your work to resolve the conflict are shown in the Results pane.

In the This window can:

• Select the layout of the window: Vertical view, horizontal view, Mixed view.

• Navigate among the differences and the conflicts.

• Select items from the left and right versions of the file to include them in the result.

• Type additional content into the file in the Result pane.

• View The history of the file. See Get The history of an item.

• Compare the various versions of the file.

• Annotate the file to see who changed. See View file changes using annotate.

When is satisfied with the contents of the Result pane, choose Accept Merge.

understand the automatic options

In special cases, your may want to restrict the types of conflicts automatically resolved by the autoresolve all option .

When you choose autoresolve all, and then specific Conflict Types, the choose Conflicts to Resolve dialog box appears.

If you want the system to automatically resolve conflicts that occurred because ...	As explained in this example ...	Then select the This check box ...
Non-conflicting content changes were made in each version of a file	The file version on the left, a zero is added at the beginning. The file on the right, a three is added at the end:	Conflicts with any content changes
Content changes were made that is unique to the workspace (during get or checkin operation) or target Versio N (during merge or rollback operation)	four and five were added T o the workspace or target version:	conflicts with content changes Made only in the local workspace or target branch
Content changes were made that is unique to the server (during get or checkin operation) or source version ( During merge or rollback operation)	four and five were added to T He server or source version:	conflicts with content changes made In the server version or source branch
A file on the server (during get or checkin operation) or in the source branch (during merge or rollback OPER ation) was renamed	The checked out a file, which is the named launch.cs and worked on it. D Uring that time, someone else checked in a changeset that affected the same file. That changeset didn't modify the contents of the file, but it did change the name of the file to star T.cs.	conflicts caused by renaming file in the server version or source branch
Common content changes were made that resulted in identical content in each version You changed a file, checked it in through a Gated check-in build, and selected the Preserve my pending changes locally Option	Changes to all version resulted in identical file content. The changes can is to the content of the files, as shown in the following example: This option also resolves conflicts is caused by all other operations (for example, rename, delete, undelete, and BR Anch) and that result in identical files. Tip If you select this check box, when you proceed, the system would resolve these changes by taking (downloading) the server V Ersion onto your workspace.	Conflicts caused by identical change in the server and workspace

Work from the command prompt

• Resolve Command

Tips

• By default, the system automatically attempts to autoresolve all conflicts. The option from the menu bar choose Tools, options, and then in the Options dialog box, navigate to Source Control, Visual Studio Team Foundation Server. Clear the attempt to automatically resolve conflicts when they is generated checkbox.

• Does your team need to collaborate to resolve a large number of conflicts (for example, which might occur after merge Oper ation in a large codebase)? If So, a public workspace to a shared dev machine might help. See Create and work with workspaces.

Go Resolve Team Foundation Version Control conflicts