adamawolf
/ Apple_mobile_device_types.txt
Last active
April 17, 2025 04:52
List of Apple's mobile device codes types a.k.a. machine ids (e.g. `iPhone1,1`, `Watch1,1`, etc.) and their matching product names
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| i386 : iPhone Simulator | |
| x86_64 : iPhone Simulator | |
| arm64 : iPhone Simulator | |
| iPhone1,1 : iPhone | |
| iPhone1,2 : iPhone 3G | |
| iPhone2,1 : iPhone 3GS | |
| iPhone3,1 : iPhone 4 | |
| iPhone3,2 : iPhone 4 GSM Rev A | |
| iPhone3,3 : iPhone 4 CDMA | |
| iPhone4,1 : iPhone 4S |
zbyhoo
/ solve_pbxproj_merge_conflict.sh
Created
May 5, 2011 09:00
Solving pbxproj files git merge conflicts when two users add files at the same time.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| projectfile=`find -d . -name 'project.pbxproj'` | |
| projectdir=`echo *.xcodeproj` | |
| projectfile="${projectdir}/project.pbxproj" | |
| tempfile="${projectdir}/project.pbxproj.out" | |
| savefile="${projectdir}/project.pbxproj.mergesave" | |
| cat $projectfile | grep -v "<<<<<<< HEAD" | grep -v "=======" | grep -v "^>>>>>>> " > $tempfile | |
| cp $projectfile $savefile |
NewerOlder