Merge Error - TF14085

Hot Topic

Trying to create an object and use it.
I need help installing Starter kits!!!!!!
TSD7025: Unable to identify schema type contained in the .sql file.
CTP6 bug: Faulty syntax in .sql file
How do I print Ascii characters?
Saving Information
Can't Open a New Project with VB Express
How can we automate(creation of test scripts) the functionality testing of windows based application developed in vb using vsts
popuplist
Internationlization problem Error with neutral culture

VS Team System

Process Hook Failed
Text Document at start up
Change date format in DatePicker control
Where do I start, Classic-C++ or .NET style?
Problem with Sharepoint using HTTPS in with Remote TFS
Team Build status shows failed at end but no errors
Roll Back Code
how to create workitem using tfs workitemtracking web service?
Size of executable
Writing text from textbox out to a file

Merge Error - TF14085

When we try to do a baseless merge we get the following error

TF14085: Cannot merge $/Path1/Branch1 to $/Path2/Branch2 because there is an incompatible pending change (not edit or encoding) at $/Path2/Branch2$/Path2/Branch2 already.

Why do we get this error Is there something wrong with Braching

Thanks,

Srikanth

Answer this question

Merge Error - TF14085

  • erikkl2000

    This means that a change (rename/delete/...) is preventing the merge.

    You need to run tf status $/Path2/Branch2$/Path2/Branch2 and see what changes are pending, you can then chose either to checkin the changes or to undo. merge should work once the changes are not in the status anymore.

  • coln

    Obvious question first: are there any pending changes in Branch2 Undo them before trying to merge.

    There are a few cases that can lead to TF14085 being thrown for trickier reasons, but they shouldn't be possible during baseless merge. Post the exact command if you can, along with any relevant history.
  • Merge Error - TF14085
Answer this question