Geek Answers Handbook

TFS Re Merge

So, in TFS, I tried to merge one branch into another - there are many files that require manual merging.

A list of conflicts appears in the dialog box. I worked for someone and went for coffee. The screensaver has appeared. When I returned to my computer, the list of conflict dialog boxes disappeared, and it seems that he “accepted them” in all the other files.

Is there a way to make the dialog come back? I do not want to start over or manually develop which remaining files I need in order to distinguish between the mess of their change.

Thanks in advance.

+4
source share
2 answers

The function you are looking for is File -> Source Control -> Resume Conflict Resolution.

While in this case the system worked correctly and did not actually allow the “AcceptTheirs” things behind you, it never hurts to be sure. I would not click the Check button if you are not sure that the merged files are in good condition.

In the worst case, change Merge again in another workspace, and then compare the results (without any manual merges) with the original workspace. This will tell you which files have and did not go through some kind of Resolve process that modifies the contents of the file.

+9
source

Got it.

Click the "Check" button. It sounds scary, I know if you do not want to register, but it appears with a dialog box informing you of the unresolved differences, and then it shows you a list of conflicting files so that you can resume fixing them.

After you finish browsing the list, TFS will inform you that the registration was canceled because there were unresolved differences.

0
source

More articles:


All Articles