Solved

Trying to resolve a conflict in subclipse

Posted on 2011-02-26
1
742 Views
Last Modified: 2012-05-11
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
Comment
Question by:opike
1 Comment
 

Accepted Solution

by:
opike earned 0 total points
ID: 34990044
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

Live: Real-Time Solutions, Start Here

Receive instant 1:1 support from technology experts, using our real-time conversation and whiteboard interface. Your first 5 minutes are always free.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

A short article about a problem I had getting the GPS LocationListener working.
Whether you've completed a degree in computer sciences or you're a self-taught programmer, writing your first lines of code in the real world is always a challenge. Here are some of the most common pitfalls for new programmers.
An introduction to basic programming syntax in Java by creating a simple program. Viewers can follow the tutorial as they create their first class in Java. Definitions and explanations about each element are given to help prepare viewers for future …
The viewer will learn how to use NetBeans IDE 8.0 for Windows to connect to a MySQL database. Open Services Panel: Create a new connection using New Connection Wizard: Create a test database called eetutorial: Create a new test tabel called ee…

776 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question