How to recover a deleted branch in TFS

tfsversion control

I deleted a branch in TFS and just found out that I need the changes that were on it.

How do I recover the branch or the changes done on it?

Best Answer

Specifically in Visual Studio go to "Tools-Options" then Select "Source Control-visual Studio Team Founation Server" and check the "Show deleted items in the Source Control explorer".

Having done that - you can then right click a folder and say "Undelete"

Related Solutions

Git – How to discard unstaged changes in Git

For all unstaged files in current working directory use:

git checkout -- .

For a specific file use:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For Git 2.23 onwards, one may want to use the more specific

git restore .

resp.

git restore path/to/file/to/revert

that together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

Git – I ran into a merge conflict. How to abort the merge

Since your pull was unsuccessful then HEAD (not HEAD^) is the last "valid" commit on your branch:

git reset --hard HEAD

The other piece you want is to let their changes over-ride your changes.

Older versions of git allowed you to use the "theirs" merge strategy:

git pull --strategy=theirs remote_branch

But this has since been removed, as explained in this message by Junio Hamano (the Git maintainer). As noted in the link, instead you would do this:

git fetch origin
git reset --hard origin

Best Answer

Related Solutions

Git – How to discard unstaged changes in Git

Git – I ran into a merge conflict. How to abort the merge

Related Topic