Take the 2-minute tour ×

we are using subclipse with to save our project in svn directory. But facing conflicts during the following scenario:

I modify a file say "file1.java" in the directory, update and commit it. Then, my colleague also has modifications to be save on the same file. So he updates and tries to commit his changes. But it doesn't allow him to commit as there is conflict and it shows the conflict on the same line!!
Any one has the idea of how to resolve this??


share|improve this question

2 Answers 2

Your colleague has to solve the conflict in the file by editing the correspondent parts. Usually they are visible by section markers like <<<<<<< .mine.

After the code has been cleaned, mark the file as "Resolved". Afterwards the file can be commited back into the repository.

share|improve this answer
so everything has to be manual here.. svn can't handle this conflict is the end tag line now!? –  Smitha Mar 22 '12 at 10:10
How should SVN know what can be discarded and what have to be kept? SVN does not know anything about programming languages - conflict resolving is always a manual job to be performed by humans. –  Robert Mar 22 '12 at 13:29

There's an existing question and answer here.

Generally the idea is that Subversion does not try to work out how your change will be integrated with the change already committed to the repository. So, it wants you to manually check and resolve the conflict.

oops missed the bus.


In case you have problems with changed package names (tree conflicts)

share|improve this answer

Your Answer


