The Chat in the Hat

Comments

# guyRonen said on February 8, 2007 7:50 AM:

Ineed help:

I am using TFS.

I have created a brunch for project proj1 which is called proj1B.

After modifing one of the files in proj1B, chek-in and merge to proj1, the modification was automatically merged into proj1.

If I modify (adding a method) on of the files in proj1, then modifying it also in proj1B (also adding a method), both check-in ---> When I come to merge proj1B to proj1 i get the conflicts dialog (which is fine) with the "Auto Merge All" button DISABLED. When I click on the "Resolve" button, I get the resolve options dialog with the first two merge options also DISABLED ("Merge changes for me" and "Merge changes in merge tool").

I have full permissions.

Anyone?

# Adam Singer said on February 8, 2007 9:01 AM:

Hi guyRonen-

Having "Auto merge" and "Merge changes for me" disabled is by design, if I understand correctly. Any time a change has taken place in two different branches in the same segment of code, even if the change is the same, we assume it's a conflict. This is because it's possible that other changes in one branch or the other actually change the behavior of the code in question and we want to make sure that a human looks over the modifications to make sure it will behave as expected.

As for why "Merge changes in merge tool" is disabled, you might want to check with the folks over on the Version Control forum to see if they can help you figure it out: http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=478&SiteID=1

Cheers,

Adam

About Adam Singer