7
votes
2answers
3k views

Subversion (SVN) and static libraries (.a files) compatibility?

I can't add .a files (static libraries) into my repository. Why ? Is there any way to "force" SVN to accept them (at least as static files...) ? Thank you
0
votes
1answer
637 views

Cannot Merge due to conflict with UserInterfaceState.xcuserstate

I created a branch and made a bunch of changes. I committed the changes and then archived the changes. Then I switched to the master branch and tried to do a merge. It said I had uncommitted changes. ...