In my work I have dealt with versioning problems in SVN , I have worked as follows, I commit each task in branch X , when I finish versão X to put it in production I make merge with Trunk and hence the new version of branch Y .
I have noticed that certain tasks did not appear in branchs later, and yesterday a co-worker reported that there were errors in trunk when running in Netbeans , being merge between versions.
I wanted to know if someone has already gone through this, because for example, the version that is in produção does not display errors when giving clean and build to Netbeans , but when I request Tortoise Svn to do% With merge with all changes of the production version with trunk , it presents conflicts so I request that the production version has the file placed in place of the trunk version and still still fails.
Use in the machine Windows 10 , with Tortoise SVN .
I did not get to look at folder permission issue where I shelter on my machine the branchs .
And finally, how should I proceed in the case of trunk ? Since there are so many inconsistências because trunk could not be wrong