What does TFS mean by Keeping a nonexistent file or Automerging with it?

623 Views Asked by At

When trying to merge a newer version of a project with an older one, I get, "The item has been deleted in the target branch" and it gives me three options:

Restore File And AutoMerge
Keep Target Branch Version
Take Source Branch Version

...as can be seen here:

enter image description here

If the file does not exist in the Target area, how could I "Keep Target Branch Version" - does it mean by that, "don't copy over the missing file"?

And how could I "Restore File And AutoMerge" - restoring it is adding it, sure, but AutoMerging? How do you automerge a single file?

What is the safe course of action when presented with these three confusing options?

1

There are 1 best solutions below

3
On BEST ANSWER

If the file does not exist in the Target area, how could I "Keep Target Branch Version" - does it mean by that, "don't copy over the missing file"?

Yes Keep Target Branch Version Keep what exists, target remains deleted

And how could I "Restore File And AutoMerge" - restoring it is adding it, sure, but AutoMerging? How do you automerge a single file?

Restore File And AutoMerge Take the previous version and merge your changes. You will end up with the old target version merged the source file taking precedence

Take Source Branch Version ignore the target and just take the source version

If you need your new file for your app to run then Take Source Branch Version