Solved

Trying to resolve a conflict in subclipse

Posted on 2011-02-26
1
745 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

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!

Question has a verified solution.

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

Suggested Solutions

Title # Comments Views Activity
Need to style Hyperlink using Word Mac 2011 5 131
Eclipse Java import and method not resolved 4 123
incorrect syntax near the order by 10 77
T-SQL Query 9 30
This is an explanation of a simple data model to help parse a JSON feed
Today, the web development industry is booming, and many people consider it to be their vocation. The question you may be asking yourself is – how do I become a web developer?
Viewers will learn how to properly install Eclipse with the necessary JDK, and will take a look at an introductory Java program. Download Eclipse installation zip file: Extract files from zip file: Download and install JDK 8: Open Eclipse and …

739 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