SVN Help

[Trantor]

am i refreshing with the correct version?

 

[KaTiON_PT]

Delete that file and update the SVN again and you will get the corrected version.

 

[Thunderbrd]

You can always doubleclick on the red line there when you see that screen to get a compare program up... but yeah the easiest way is what Kation just said.

 

[Toffer90]

Use the SVN cleanup command, check all checkboxes if unsure when prompted.

 

[Thunderbrd]

You can also right-click on the red line there and select 'use theirs' to have the updater choose to consider there to be no conflict after it changes the file to match what the current svn update says it should be.

You got this conflict by manipulating the file in a way that can't easily be merged with the incoming updated file.

You can also right-click on the red line and select 'use mine' to have the updater choose to consider there to be no conflict after it changes the file to match what you had before the update. But this will make it difficult to get any further updates on that file.

 

[Trantor]

thanks .... it worked