Tag Archives: merge failed

I surrender!

I spent an entire weekend trying to successfully merge to unversioned copies of source code for the same project without success. Here it is Sunday night @ 8pm. Just when I thought I finally got the non-matching lines of code … Continue reading

Leave a Comment

Filed under Apple, Inc.