How to resolve a conflict in Eclipse SVN

Question

When using Eclipse in coding and SVN for the command repository, I am having problems with conflicts in Eclipse.

Suppose I have a conflict, and there are 3 automatically generated files. Once I resolved the conflict, I can’t find a command on how to solve the conflict and automatically delete the generated files.

In SVN, outside of Eclipse, there is a Resolve Conflict function, and the codes will be updated. In addition, the generated files for the conflict will be deleted. Is there a similar method in Eclipse or do I need to manually delete the generated files and commit the solution?

Answer 1

In addition to the answers given in the corresponding question, you can also resolve the conflict, delete the automatically generated files and Mark as merge .

Answer 2

I had the same problem and none of the solutions mentioned resolved my problem. When I right-click on the folder, there was no permission to resolve the conflict or mark it as resolved or any other.

As I enabled it in Eclipse (with the Subclipse plugin), I right-click on the folder and select "Show Tree Conflicts". This opened a view pane in Eclipse called "SVN Tree Conflicts", which showed this folder.

I right-clicked this message and selected "Resolve". Then a window appeared asking what I want to do. I basically unchecked all the boxes associated with accepting a left file or file or merge. Because basically, I just wanted to mark the conflict as resolved and accept the folder as is, from the repository.

Then I was able to continue updating my project without any problems.

Answer 3

The way I do this is to change the perspective to " Team Synchronizing ", and on the "Synchronization" tab, right-click the file and select " Mark as merged "

Answer 4

In Eclipse, on the Team menu, you can select edit conflicts or mark resolved

see Resolving Subquery Conflicts

Answer 5

Another solution (similar to princepieros) is to right-click on your project → Execute the whole commit → It will display “Conflict” elements → Right-click these elements and click “Mark as merged” or “Change conflict”. This helped me hope this helps.