Resolving a conflict on tortoise

I recently asked a question about committing a new file but now I am having trou开发者_高级运维ble resolving a conflict.

Says

SOURCE LEFT SOURCE RIGHT

how do you want to resolve...

gives me choices to merge changes into a new file or mark as resolved- neither really works. when i mark as resolved i get a big red x and when i merge its still not letting me overwrite as the file over the conflicted file

Assuming that you have resolved the conflicts and saved then you should be able to use the command "TortoiseSVN -> Resolved" to mark the file as resolved. This should then allow you to commit your changes to the repository.

More information about TortoiseSVN merges can be found here