Checked out, conflicting errror

[shyam_uthaman]

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

[lucas_oliveira]

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

[shyam_uthaman]

Hi Lucas,

Thanks for the reply.

But the screenshot from earlier was already from the repository.

I neither have the team option nor the Resolve with enabled as you can see below.

[lucas_oliveira]

That should be on your project explorer tab instead. That's the internal repository.

If that's not available on your current machine, you can still use the 'reset to' option and/or compare the existing versions as well.

BRs,
Lucas de Oliveira

[shyam_uthaman]

Hi,

I have imported this package but these red ones with conflicts don't show up there.

The only place I can see them are in the repository.

Regards,

Shyam

[lucas_oliveira]

That's weird. Can you check and compare the versions of that file? (show in history option). Reverting to a valid one should do the trick but I really don't understand the root cause.

[shyam_uthaman]

The reset to says: 'No changes to reset' and the compare just shows blank.

[lucas_oliveira]

No older versions as well? Maybe try to checkout and import the whole project into your local filesystem, make a dummy change and commit the change. This should bypass this issue.