Solved

Trying to resolve a conflict in subclipse

Posted on 2011-02-26
1
746 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
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
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

Industry Leaders: 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!

Question has a verified solution.

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

This article will show, step by step, how to integrate R code into a R Sweave document
Displaying an arrayList in a listView using the default adapter is rarely the best solution. To get full control of your display data, and to be able to refresh it after editing, requires the use of a custom adapter.
The viewer will learn how to synchronize PHP projects with a remote server in NetBeans IDE 8.0 for Windows.
Progress

705 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