tfs - What causes merge conflicts in Team Foundation Server? -
i run conflicts when effort merge files. when resolving conflicts, "conflicts" seem changes in new version (source file). shouldn't tsf "know" , merge file without flagging conflict? there threshold on number of changes file can contain before raises merge conflict? other members of dev team not have issue, or not me.
one possible unique circumstance have dev tfs server , production server. getting these conflicts when merging dev production. again, no 1 else experiences issue.
we running tfs 2010.
tfs merge
No comments:
Post a Comment