Hello, Got stuck at a current issue. When I want to commit my files, it says that I've got some conflicted files. After some investigation, turns out it is some widget that is conflicted. Any idea how I can fix this? It tells me to use the TortoiseSVN, but I've got no idea what this even is.
Have a look at this page for more information on versioning and hanling conflicts: