Skip to Content

Checked out, conflicting errror

Hi All,

There's a small issue that really bugs me..

In the repositories tab in dev perspective, some of the files show the Checked out, conflicting message with a red symbol on them.

They don't allow me to edit them but my colleagues can. How do I fix this?

Thanks!

Regards,

Shyam

diamond.JPG (18.5 kB)
Add a comment
10|10000 characters needed characters exceeded

Assigned Tags

Related questions

1 Answer

  • Posted on Nov 20, 2015 at 11:51 AM

    Hi,

    That means that your file is already updated in the repository and you're holding an older version but happened to change it. I fyou want to pick and choose the differences just click with the right button on your file then Team -> Merge tool.

    There are other quicker options as well (Team -> Resolve with -> Remote/Local).

    BRs,

    Lucas de Oliveira

    Add a comment
    10|10000 characters needed characters exceeded

Before answering

You should only submit an answer when you are proposing a solution to the poster's problem. If you want the poster to clarify the question or provide more information, please leave a comment instead, requesting additional details. When answering, please include specifics, such as step-by-step instructions, context for the solution, and links to useful resources. Also, please make sure that you answer complies with our Rules of Engagement.
You must be Logged in to submit an answer.

Up to 10 attachments (including images) can be used with a maximum of 1.0 MB each and 10.5 MB total.