This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Hello, In tortoise SVN client, the user can solve an specific conflict 4 ways: 1. Resolve conflict using 'theirs'. 2. Resolve conflict using 'mine'. 3. Resolve conflict using first 'theirs' and then 'mine'. 4. Resolve conflict using first 'mine' and then 'theirs'. The later two options are very useful when two people are working on the same source and they need to maintain their changes but also the other's changes. I could not find a way to use the options 3 and 4, Does NetBeans support those options? How can use them? Thank you very much for your advice. Best regards.
I don't know what 3. and 4. do. Could you evaluate, maybe on an example?
Scenario John has an up to date working copy of the file Example.java. John adds some code from the line 3 to the line 8. Anna also has an up to date copy of Example.java. Anna edits the file and she adds 2 new lines starting from the line #3. Anna commits the file. (So now the official version of the file is the anna's one) When John makes an update of the file before doing the commit, he realizes that there is a conflict(Sometimes svn merge the file without problems, but in other cases it cannot do it and marks the file as confictive). When he looks throw the file he realize that Anna has added an important validation. John decides to resolve the conflic using both code segments, so he selects the option: Resolve conflict using first 'theirs' and then 'mine'. That means that his working copy will have the anna's validation first and then the code added by John (He could also decide to use first his code and then the one added by anna). In my case I had the same problem as John, and I could not find a way to solve it using netbeans, So I had to solve the problem externally using Tortoise SVN I hope this scenario is clear enough. Thanks for your advice. Kindly regards. German Rivas.
I see, thanks for clarifying. But i will disappoint you, that's not possible with the current state of the conflicts resolver.
Ok, thank you very much for your answer. If you decide to implement something like that, please let me know. Best regards.