Needs Merge

[btd]

I check out a file, make a change and then check it back in.
I launch Vault only to find the file status says "Needs Merge".

Why is this happenning and what can I do to resolve?

Also, what does file status Renegade mean? As I have some files in this state too.

Thanks

Tom

[Beth]

Your 'needs merge' could happen if someone else checked out while you had it checked out, made a change, and then managed to check in before you did, or if something prevented your cache from being able to update itself during the checkout.

Perform a Show Differences on the file and diff it against the current repository version. Are there any differences that you didn't put in yourself?

Next try diff'ing against the last version retrieved. Do you see much difference between the two diff's?

Renegade means that a change happened to a file without a check-out happening.