What does TFS mean by saving a nonexistent file or Automerging with it?
When trying to merge a newer version of a project with an older version, I get "Item deleted in target branch" and it gives me three options:
Restore File And AutoMerge
Keep Target Branch Version
Take Source Branch Version
... as you can see here:
If the file does not exist in the "Target" area, how can I "keep the target version" - does that mean "don't copy the missing file"?
And how can I "Recover File and AutoMerge" - restoring it adds of course, but AutoMerging? How do you automate a single file?
What is the safe course of action when presented with these three confusing options?
source to share
If the file does not exist in the target area, how can I "Keep Target Branch Version" - does that mean "don't copy the missing file"?
Yes Keep version of target version Keep what exists, target remains deleted
And how can I "Recover File and AutoMerge" - rebuilding is adding this of course, but AutoMerging? How do you automate a single file?
Recover File and AutoMerge Take the previous version and merge your changes. You will be taken to the old target version, draining the source file with priority
Take the original version of the branch ignore the target and just grab the original version
If you need your new file for your application then grab the original branch
source to share