Subclipse > Accidental Merge Conflict Resolution

Posted by DTS on Stack Overflow See other posts from Stack Overflow or by DTS
Published on 2010-02-10T23:37:30Z Indexed on 2010/03/28 5:03 UTC
Read the original article Hit count: 498

Filed under:

subclipse

|

svn

I'm trying to merge changes from one branch into another using Subclipse. On a particular file in a particular subdirectory, I had a file conflict and edited the conflicts via the context menu option for this. However, when I went to resolve the conflict I apparently chose the wrong option and was left with the original unmerged file in my branch.

Since then, I can no longer get this file back into a conflicted state so I can resolve this issue properly. I've tried deleting the file and the directory that contains it, to no avail.

Any ideas?

© Stack Overflow or respective owner

Related posts about subclipse

Using branched svn repository in Eclipse without Subversive/Subclipse

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I use a new branch in Eclipse if I'm not using Subversive or Subclipse? Do I have to checkout the new branch and import that as a new project into Eclipse? Is there an easier way to do it, or is using Subversive or Subclipse the only reasonable way? I know there are many discussions on… >>> More
Subclipse on Mac - Change user

as seen on Super User - Search for 'Super User'
Hi, I'm using subclipse on mac. I did a checkout using a temp username and password yesterday. Now that I have a new username and password, how can I change my credentials without having to delete my checkout and recheckout? Thank you, Tee >>> More
Eclipse: Subclipse "Edit Conflicts"

as seen on Stack Overflow - Search for 'Stack Overflow'
I have found that when using Subclipse to edit conflicts, all my syntax color settings are preserved except for the background color, which is reset to the standard white. Using my particular color scheme makes it almost impossible to read any of the text when stuck with a white background. Is there… >>> More
Subclipse > Accidental Merge Conflict Resolution

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm trying to merge changes from one branch into another using Subclipse. On a particular file in a particular subdirectory, I had a file conflict and edited the conflicts via the context menu option for this. However, when I went to resolve the conflict I apparently chose the wrong option and was… >>> More
Subclipse plugin doesn't work in Eclipse?

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, even though there was no error when installing Subclipse in Eclipse. I won't see the SVN perspective at all? I have tried with "Eclipse Classic 3.5.1" and with "Eclipse for PHP Developers". After downloading and unzipping the packages I used Eclipse's "Install Software" mechanism to install Subclipse… >>> More

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More