This is always a pain, no matter what source control system I have used (Visual SourceSafe, CVS, ClearCase, etc.). The binary .frx files always cause a problem when merging Visual Basic forms.
I know...I know...why are you using Visual Basic...because there are lots of legacy applications still written using it and although I hate to admit it, I actually like using it (ducks tomatoes).
See Question&Answers more detail:
os 与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…