Solved

Trying to resolve a conflict in subclipse

Posted on 2011-02-26
1
739 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
Comment Utility
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

How your wiki can always stay up-to-date

Quip doubles as a “living” wiki and a project management tool that evolves with your organization. As you finish projects in Quip, the work remains, easily accessible to all team members, new and old.
- Increase transparency
- Onboard new hires faster
- Access from mobile/offline

Join & Write a Comment

This is an explanation of a simple data model to help parse a JSON feed
This is about my first experience with programming Arduino.
This tutorial covers a step-by-step guide to install VisualVM launcher in eclipse.
The viewer will learn how to use and create new code templates in NetBeans IDE 8.0 for Windows.

771 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

Need Help in Real-Time?

Connect with top rated Experts

12 Experts available now in Live!

Get 1:1 Help Now