Go Premium for a chance to win a PS4. Enter to Win

x
  • Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 750
  • Last Modified:

Trying to resolve a conflict in subclipse

I'm using subversion for version control and I removed a file from the subversion repository and then also from the file system. Now when I try to synchronize a conflict comes up (see screenshot) and I can't figure out how to resolve it.

eclipse screenshot
When I try to open up the Compare Editor a null pointer exception is thrown.

I'm using subclipse version 1.6.17 and google code as my svn repository (not sure what the version is).
0
opike
Asked:
opike
1 Solution
 
opikeAuthor Commented:
I did a "revert" and that fixed the synchronization issues and the file logfile2.txt no longer shows up as part of the project, which is what I wanted.
0

Featured Post

Technology Partners: We Want Your Opinion!

We value your feedback.

Take our survey and automatically be enter to win anyone of the following:
Yeti Cooler, Amazon eGift Card, and Movie eGift Card!

Tackle projects and never again get stuck behind a technical roadblock.
Join Now