Click here to Skip to main content
15,074,483 members
Please Sign up or sign in to vote.
0.00/5 (No votes)

When checking into TFS 2012 and there's a conflict, I resolve the conflict and check in.

This saves a copy of the merged file to my local workspace. I get all changes meaning if a reference to something another developed added suddenly my local workspace fails to build because of missing dependencies.

This is most disruptive when project files have conflicts.

Is there some way to check in the merged file without effecting my local file until I'm ready to get latest?

Can TFS be configured so the a supervising team member can be responsible for resolving all conflicts? So TFS just accepts check ins.



This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

  Print Answers RSS
Top Experts
Last 24hrsThis month

CodeProject, 20 Bay Street, 11th Floor Toronto, Ontario, Canada M5J 2N8 +1 (416) 849-8900