Subversion misery
Subversion misery
- Subject: Subversion misery
- From: Matthew Weinstein <email@hidden>
- Date: Sat, 27 Mar 2010 10:45:56 -0700
I've been using subversion (@ sourceforge) for a few months to provide an archive and record of changes and now have run into problems. Hoping someone can tell me how to proceed. What happened was that I was off the web for about a week, I had a set of fixes that I wanted to commit, and then to keep working... So, I simply zipped up my directory at the commit stage, went back to working on the next release. When I got home, I unzipped my archive, committed, and then deleted that and continued with the directory that had the additional changes. Subversion is not happy. It has given me a bunch of files with "U" next to their name and I can't figure out how to say to it, commit this file or the whole project, for that matter without getting an error:
Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed (details follow):
Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Aborting commit: '/Users/matthew/prog/TA3/TASVN/TA From SVN/tamsanalyzer/English.lproj/InfoPlist.strings' remains in conflict
How do I say: really accept these files as the latest...
Thanks deeply for any help with this.
--Matthew Weinstein
May Day Softworks
TAMS Analyzer: http://tamsys.sf.net/
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden