I'd say about 85% of the time when I have file(s) in conflict, not
only will Versions not be able to resolve the conflict, but usually it
won't even display that there are files in conflict. I have to go back
to the command line to resolve the conflicts, then Versions will work
as normal.

Of course, since I have to go to the command line to do switches,
merges, and conflict resolution, and since I find that since versions
only reliably does "svn up" or "svn commit" I just use the command
line instead.

Shan

On Feb 21, 9:19 am, Ali Elhajj <[email protected]> wrote:
> I am unable to commit the project.pbxproj file.  The file is shown as
> "added" in SVN.  i cannot commit it and I cannot mark it as resolved.
> I am able to checking the pbxUser and perspectivev3 files, but not the
> project.pbxproj.
>
> Any suggestions?

-- 
You received this message because you are subscribed to the Google Groups 
"Versions" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.

Reply via email to