Sunday, 15 March 2015

TFS Merge missing out few files during merge -



TFS Merge missing out few files during merge -

i facing below scenario while merging in tfs. not sure if using right approach.

i have main dev branched out. several changes have been made in dev , around 10 files modified in main. want merge dev on main, 10 files modified in main must overwritten 1 in dev, along other changes. when merge, 10 files not getting afftected in main showing other files. how merge work?

when seek merge main on dev files created in dev waiting deleted in pending changes. how merge possible.

if want rid of changes in main (instead of merging them dev), rollback changesets in main don't want, merge dev main.

tfs merge branch

No comments:

Post a Comment