How to resolve conflicts in TFS

conflicttfsversion control

How do I resolve conflicts in TFS?

I must have forgotten to do a recursive get before editing a file. Whatever the cause is, I must now figure out how to resolve a conflict.

When I click on the workspace to performa check-in. One of the files as a two-way pointing arrow which I guess must mean there is a conflect.

When I click to perform a "Check In" a message box appears that tells me:
"No files checked in due to conflicting changes. Please use Conflicts Channel to resolve conflicts and try again".

So I googled "Conflicts Channel TFS" and I got some results but all of the results only gave suggestions, like, Click on "Automatic Resolve". The problem is that I do not see any of the menu commands or buttons to ckick on that they suggest.

Best Answer

Try getting latest on the file. That should trigger the conflict resolution screen.

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