More Related Content Similar to Mastering the Project File (AltConf) (20) More from Michele Titolo (20) 6. <<<<<<< HEAD
! ! ! ! A487DC9215FE5DCD0037E8A3 /* AppDelegate.h */,
! ! ! ! A487DC9315FE5DCD0037E8A3 /* AppDelegate.m */,
! ! ! ! D9CA01C11720AD7D00CBD2B2 /* View Controllers */,
=======
! ! ! ! D9CA01B71720AC3000CBD2B2 /* Base */,
! ! ! ! D9CA01BB1720AC3C00CBD2B2 /* Controllers */,
>>>>>>> new_ratings
Thursday, June 5, 14
7. Falling back to patching base and 3-way merge...
Auto-merging MyApp.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in
! MyApp.xcodeproj/project.pbxproj
Failed to merge in the changes.
Patch failed at 0037 Launch screen images update
The copy of the patch that failed is found in:
! /tmp/git/.git/rebase-apply/patch
Thursday, June 5, 14
30. // !$*UTF8*$!
{
! archiveVersion = 1;
! classes = {
! };
! objectVersion = 46;
! objects = {
/* Begin PBXBuildFile section */
! ! 8A9D5590A3E24AC297598750 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef...
! ! D94D3E72170B80FB00EA401C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; f...
! ! D94D3E74170B80FB00EA401C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFi...
! ! D94D3E76170B80FB00EA401C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuild...
! ! D94D3E7C170B80FB00EA401C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; ...
! ! D94D3E7E170B80FB00EA401C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D94...
! ! D94D3E82170B80FB00EA401C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRe...
! ! D94D3E84170B80FB00EA401C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRe...
! ! D94D3E86170B80FB00EA401C /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fil...
! ! D94D3E88170B80FB00EA401C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile...
Thursday, June 5, 14
35. objects = {
D94D3E72170B80FB00EA401C = {...};
D94D3E74170B80FB00EA401C = {...};
D94D3E76170B80FB00EA401C = {...};
532ABB3011D5647300D29D20 = {...};
532ABB3111D5647300D29D20 = {...};
532ABB3211D5647300D29D20 = {...};
532ABB3311D5647300D29D20 = {...};
};
Thursday, June 5, 14
37. objects = {
532ABB3011D5647300D29D20 = {...};
532ABB3111D5647300D29D20 = {...};
532ABB3211D5647300D29D20 = {...};
532ABB3311D5647300D29D20 = {...};
};
0
1
2
3
Thursday, June 5, 14
39. 04A4CCDA164D5E0400FB5950 /* Project object */ = {
! isa = PBXProject;
! attributes = {
! ! CLASSPREFIX = MRT;
! ! LastUpgradeCheck = 0450;
! ! ORGANIZATIONNAME = "Michele Titolo";
! };
! buildConfigurationList = 04A4CCDD164D5E0400FB5950;
! compatibilityVersion = "Xcode 3.2";
! developmentRegion = English;
! hasScannedForEncodings = 0;
! knownRegions = (
! ! en,
! );
! mainGroup = 04A4CCD8164D5E0400FB5950;
! productRefGroup = 04A4CCE4164D5E0400FB5950 /* Products */;
! projectDirPath = "";
! projectRoot = "";
! targets = (
! ! 04A4CCE2164D5E0400FB5950 /* MyApp */,
! ! D9D2509C173AB9AD0046F074 /* MyApp Test */,
! ! D9E6BA6A177CDB9C00C98B08 /* MyApp KIF */,
! );
};
Thursday, June 5, 14
40. 04A4CCDA164D5E0400FB5950 /* Project object */ = {
! isa = PBXProject;
! attributes = {
! ! CLASSPREFIX = MRT;
! ! LastUpgradeCheck = 0450;
! ! ORGANIZATIONNAME = "Michele Titolo";
! };
! buildConfigurationList = 04A4CCDD164D5E0400FB5950;
! compatibilityVersion = "Xcode 3.2";
! developmentRegion = English;
! hasScannedForEncodings = 0;
! knownRegions = (
! ! en,
! );
! mainGroup = 04A4CCD8164D5E0400FB5950;
! productRefGroup = 04A4CCE4164D5E0400FB5950 /* Products */;
! projectDirPath = "";
! projectRoot = "";
! targets = (
! ! 04A4CCE2164D5E0400FB5950 /* MyApp */,
! ! D9D2509C173AB9AD0046F074 /* MyApp Test */,
! ! D9E6BA6A177CDB9C00C98B08 /* MyApp KIF */,
! );
};
isa
mainGroup
targets
buildConfigurationList
Thursday, June 5, 14
43. targets = (
! 1D6058900D05DD3D006BFB54 /* MyApp */,
! D94C698916E6E808002BDD31 /* MyApp Test */,
! D9E1D32A16E6FCC100C0524D /* MyApp Pro */,
);
Thursday, June 5, 14
44. projectReferences = (
! {
! ! ProductGroup = D94C698116E6E7DE002BDD31 /* Products */;
! ! ProjectRef = D94C698016E6E7DE002BDD31 /* KIF.xcodeproj */;
! },
);
Thursday, June 5, 14
54. 04A4CD07164D5E0400FB5950 /* Debug */ = {
! isa = XCBuildConfiguration;
! baseConfigurationReference = 4B98CBDFD81F4259923E97CE;
! buildSettings = {
! ! CODE_SIGN_IDENTITY = "iPhone Developer";
! ! "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
! ! GCC_PRECOMPILE_PREFIX_HEADER = YES;
! ! GCC_PREFIX_HEADER = "MyApp/MyApp-Prefix.pch";
! ! GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
! ! INFOPLIST_FILE = "MyApp/MyApp-Info.plist";
! ! PRODUCT_NAME = "$(TARGET_NAME)";
! ! PROVISIONING_PROFILE = "";
! ! "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
! ! WRAPPER_EXTENSION = app;
! };
! name = Debug;
};
PROVISIONING_PROFILE
PRODUCT_NAME
INFOPLIST_FILE
GCC_VERSION
CODE_SIGN_IDENTITY
name
Thursday, June 5, 14
59. 04A4CCE2164D5E0400FB5950 /* MyApp */ = {
! isa = PBXNativeTarget;
! buildConfigurationList = 04A4CD06164D5E0400FB5950 /* Build
configuration list for PBXNativeTarget "MyApp" */;
! buildPhases = (
! ! 29390B06A9D3479F9566AA27 /* Check Pods Manifest.lock */,
! ! 04A4CCDF164D5E0400FB5950 /* Sources */,
! ! 04A4CCE0164D5E0400FB5950 /* Frameworks */,
! ! 04A4CCE1164D5E0400FB5950 /* Resources */,
! ! F3BAB5EA93C24AE18A4EE832 /* Copy Pods Resources */,
! );
! buildRules = ();
! dependencies = ();
! name = MyApp;
! productName = MyApp;
! productReference = 04A4CCE3164D5E0400FB5950 /* MyApp.app */;
! productType = "com.apple.product-type.application";
};
buildPhases
name
buildConfigurationList
productName
Thursday, June 5, 14
65. F3BAB5EA93C24AE18A4EE832 /* Copy Pods Resources */ = {
! isa = PBXShellScriptBuildPhase;
! buildActionMask = 2147483647;
! files = ();
! inputPaths = ();
! name = "Copy Pods Resources";
! outputPaths = ();
! runOnlyForDeploymentPostprocessing = 0;
! shellPath = /bin/sh;
! shellScript = ""${SRCROOT}/Pods/Pods-resources.sh"n";
};
shellScript
Thursday, June 5, 14
72. <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://
www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
! <key>SchemeUserState</key>
! <dict>
! ! <key>MyApp.xcscheme_^#shared#^_</key>
! ! <dict>
! ! ! <key>orderHint</key>
! ! ! <integer>1</integer>
! ! </dict>
! </dict>
! <key>SuppressBuildableAutocreation</key>
! <dict>
! ! <key>1D6058900D05DD3D006BFB54</key>
! ! <dict>
! ! ! <key>primary</key>
! ! ! <true/>
! ! </dict>
! </dict>
</dict>
</plist>
MyApp.xcscheme_^#shared#^_
Thursday, June 5, 14
