TFS shows pending changes with status “merge”. If I check these in, will any files change

tfs

I'm doing a merge of files in TFS. It's a bit tricky because some files in the target have been moved or deleted.

After doing the merge and resolving conflicts, TFS shows a number of pending changes with status "merge".

If I check these in, will any files change?

I'm thinking that if I check in pending changes that are shown (in the Change column) with status "merge" that this just updates merge records in TFS so that if I repeat the merge it won't try and re-merge these files unless they've changed. Is this right? I don't want to check in this great big list of files and end up changing the contents/names/deleted status of files.

Best Answer

As far as i understand, merge specifically means that its this revision contains the merge from a another branch. however, i think merge -only- represent the merge operation.

If a particular file is diffrent in the two branches the file will have the status "merge, edit" because it is both merged from the branch and changed content-wise.

So in other words, if you have a main-branch with 2 files, make a dev-branch of that, make a change in one of the files only and then to a merge, the pending changes on the main-branch should look like this:

FileA.cs > merge
FileB.cs > merge, edit

Related Solutions

How to ignore files/directories in TFS for avoiding them to go to central source repository

If you're using local workspaces (TFS 2012+) you can now use the .tfignore file to exclude local folders and files from being checked in.

If you add that file to source control you can ensure others on your team share the same exclusion settings.

Full details on MSDN - http://msdn.microsoft.com/en-us/library/ms245454.aspx#tfignore

For the lazy:

You can configure which kinds of files are ignored by placing a text file called .tfignore in the folder where you want rules to apply. The effects of the .tfignore file are recursive. However, you can create .tfignore files in sub-folders to override the effects of a .tfignore file in a parent folder.

The following rules apply to a .tfignore file:

# begins a comment line

The * and ? wildcards are supported.

A filespec is recursive unless prefixed by the \ character.

! negates a filespec (files that match the pattern are not ignored)

Example file:

# Ignore .cpp files in the ProjA sub-folder and all its subfolders
ProjA\*.cpp
# 
# Ignore .txt files in this folder 
\*.txt
#
# Ignore .xml files in this folder and all its sub-folders
*.xml
#
# Ignore all files in the Temp sub-folder
\Temp
#
# Do not ignore .dll files in this folder nor in any of its sub-folders
!*.dll

How do i remove files from the Pending Changes list in TFS when those files have been deleted locally

Right-click on the file in the Pending Changes List, choose Undo.

Best Answer

Related Solutions

How to ignore files/directories in TFS for avoiding them to go to central source repository

How do i remove files from the Pending Changes list in TFS when those files have been deleted locally

Related Topic