Xcode 6.3 fixes this horrible merge crash issue. Sent from my iPod Touch. Please pardon typos.
On Jun 1, 2015, at 9:42 AM, Steve Mills <[email protected]> wrote: >> On Jun 1, 2015, at 08:33, Alex Zavatone <[email protected]> wrote: >> >> In merge hell this morning. >> >> We have one file with conflicts that always crashes Xcode 6.2 when the file >> is selected in the merge window. >> >> It's an unrecognized selector inside [NSAttributeDictionaryEnumerator >> needsUpdate]. >> >> It also is the second file that has conflicts in this Git branch. >> >> Any ideas on this one? Update to Xcode 6.3? > > Merge using something else, like an actual git client or the command line. > > Steve via iPad > _______________________________________________ Do not post admin requests to the list. They will be ignored. Xcode-users mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/xcode-users/archive%40mail-archive.com This email sent to [email protected]
