Link to home
Create AccountLog in
Avatar of chuang4630
chuang4630

asked on

How to view existing conflict (for merge)

I try to merge the branch back to the trunk. I accidently close the merger conflict dialog box. Now I cannot do the merge again. The error is that there is an exising conflict. How do I view and take action on that conflict again?
Avatar of chuang4630
chuang4630

ASKER

It is Visual Studio 2008
ASKER CERTIFIED SOLUTION
Avatar of Kumaraswamy R
Kumaraswamy R
Flag of India image

Link to home
membership
Create an account to see this answer
Signing up is free. No credit card required.
Create Account