Geek Answers Handbook

TFS shows pending changes with the status "merge". If I check them, will any files be changed?

I am doing file merging in TFS. This is a bit complicated because some files in the target have been moved or deleted.

After merging and resolving conflicts, TFS displays a series of pending changes with the status "merge".

If I check them, will any files be changed?

I think that if I check the pending changes that are displayed (in the "Change" column) with the status "merge", it just updates the merge records in TFS, so if I repeat the merge, it will not try to repeat -build these files. if they have not changed. It is right? I do not want to check this large list of files and end up changing the contents / names / deleted status of the files.

+5
source share
3 answers

As I understand it, merging specifically means that its revision contains merging with another branch. however, I think the merger - only - represents a merge operation.

, "merge, edit", , .

, , dev-branch , , , :

FileA.cs >
FileB.cs > merge, edit

+5

, - . , .

, .

, , , ( ) , .

+3

If the files in your workspace match the latest version, the check will not include these files in the changeset.

0
source

More articles:


All Articles