How to merge new files into another branch in TFS?

前端 未结 5 1911
温柔的废话
温柔的废话 2021-02-18 14:48

Ok, in TFS we have a main trunk branch and another branch, let\'s call it secondary. We have created a new file in the trunk but when trying to merge

5条回答
  •  失恋的感觉
    2021-02-18 15:03

    I think this should be possible over the VS GUI as follows:

    Select the folder where the new file was added and order a merge (of the whole folder) to your secondary branch.
    Now all changed files of the folder appear in your pending list + your new file.
    Undo all other files & proceed with checking in only the one file that matters.

    One could argue that this restriction of TFS in fact makes sense:

    • If you 've made additional changes to the files you 're hereby protected from breaking your secondary branch.
    • If you haven't made additional changes to any other files, it still makes sense to merge your, since the merge will only contain your new file.

提交回复
热议问题