Tiffany Scherf

I merge from our main line to our developer branch every week. This is the first time I have ever seen this issue. I have 52 files that need to be resolved. When I click the "Auto merge all" button I get the object reference message on the first file and the resolve process stops. I then chose a few different files and selected to resolve them and got the same object reference message for them. If I compare the files, I can see that there are definitely differences. Is there any way to fix this issue

Thanks,

Tiffany



Re: Team Foundation Server - Version Control "Object reference not set to an instance of an object" error during resolve

Tan Phan

Can you give us more information about your scenario

1. What version of Visual Studio

2. Did you use the command line tf.exe or Visual Studio

3. What if you select just that one conflict and click Resolve instead of Auto merge all What do you see in the detailed resolve dialog

4. Do you get the same crash when running the command line version: tf resolve <item> /noprompt /auto:acceptmerge

Thanks. -Tan





Re: Team Foundation Server - Version Control "Object reference not set to an instance of an object" error during resolve

Tan Phan

Tan Phan wrote:

Can you give us more information about your scenario

1. What version of Visual Studio

2. Did you use the command line tf.exe or Visual Studio

3. What if you select just that one conflict and click Resolve instead of Auto merge all What do you see in the detailed resolve dialog

4. Do you get the same crash when running the command line version: tf resolve <item> /noprompt /auto:acceptmerge

Thanks. -Tan

Tiffany,

Do you have additional information

Thanks. -Tan





Re: Team Foundation Server - Version Control "Object reference not set to an instance of an object" error during resolve

Tan Phan

Tan Phan wrote:
Tan Phan wrote:

Can you give us more information about your scenario

1. What version of Visual Studio

2. Did you use the command line tf.exe or Visual Studio

3. What if you select just that one conflict and click Resolve instead of Auto merge all What do you see in the detailed resolve dialog

4. Do you get the same crash when running the command line version: tf resolve <item> /noprompt /auto:acceptmerge

Thanks. -Tan

Tiffany,

Do you have additional information

Thanks. -Tan

Closing thread due to no reply from customer.

-Tan