Hello,
Someone of my team accidentaly commited a faulty version of a new function that we were working on.
Now we want to role back to a previous version of the main line and commit that, but we getting an error that one or more files are conflicted(not saying which files) and
says that we need to use TortoiseSVN to fix that error. But we don't know what we should TortoiseSVN for or how to use it.
Does someone have an idea?