TFS - Conflict merges overwrite local

See more:

Visual-Studio

TFS

VS2012

Hi,

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.

Thanks,

Steve