[Adium-devl] Problems With Storing Info. for Contact

[Graham Booker]

On Jun 6, 2008, at 7:48 AM, George Armah wrote:

> Peter Hosey wrote:
>>
>> What does svn st say?
>>
> M      Plugins/WebKit Message View/en.lproj/ 
> WebKitPreferencesView.nib/info.nib
> M      Plugins/WebKit Message View/en.lproj/ 
> WebKitPreferencesView.nib/keyedobjects.nib
> M      Plugins/WebKit Message View/en.lproj/ 
> WebKitPreferencesView.nib/classes.nib
> M      Adium.xcodeproj/project.pbxproj
> ?      Resources/MainMenu.nib/info.nib.r23802
> ?      Resources/MainMenu.nib/keyedobjects.nib.r23802
> ?      Resources/MainMenu.nib/classes.nib.r23802
> ?      Resources/MainMenu.nib/info.nib.mine
> ?      Resources/MainMenu.nib/keyedobjects.nib.mine
> ?      Resources/MainMenu.nib/classes.nib.mine
> ?      Resources/MainMenu.nib/info.nib.r23013
> ?      Resources/MainMenu.nib/keyedobjects.nib.r23013
> ?      Resources/MainMenu.nib/classes.nib.r23013
> C      Resources/MainMenu.nib/info.nib
> C      Resources/MainMenu.nib/keyedobjects.nib
> C      Resources/MainMenu.nib/classes.nib
>

C means conflict.  That means you have modified the files locally, and  
they were also modified on the server.  When you updated svn, it was  
incapable of merging the two changes together, so it created a file  
with the conflicts shown.

Conflicts with nibs can be hard to resolve.  You may be best running  
svn revert on those files and redoing your changes.

> Thanks for the help !
>
> George.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20080606/a221b8d9/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3632 bytes
Desc: not available
URL: <http://adium.im/pipermail/devel_adium.im/attachments/20080606/a221b8d9/attachment.p7s>