Merge pull request #1546 from Coeur/patch-1

DerivedData and xcuserdata are folders; *.xcuserstate is always inside

Merge pull request #1546 from Coeur/patch-1
DerivedData and xcuserdata are folders; *.xcuserstate is always inside
352c903c · Brendan Forster · 8ae0b3e1 · f17925fe · 352c903c · 352c903c
隐藏空白更改
内联并排

Showing with 10 addition and 12 deletion

Global/Xcode.gitignore Global/Xcode.gitignore +4 -4

Objective-C.gitignore Objective-C.gitignore +3 -4

Swift.gitignore Swift.gitignore +3 -4

未找到文件。
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -4,7 +4,7 @@
 ## Build generated
 build/
-DerivedData
+DerivedData/
 ## Various settings
 *.pbxuser
@@ -15,9 +15,9 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -4,7 +4,7 @@
 ## Build generated
 build/
-DerivedData
+DerivedData/
 ## Various settings
 *.pbxuser
@@ -15,12 +15,11 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 ## Obj-C/Swift specific

--- a/Swift.gitignore
+++ b/Swift.gitignore
@@ -4,7 +4,7 @@
 ## Build generated
 build/
-DerivedData
+DerivedData/
 ## Various settings
 *.pbxuser
@@ -15,12 +15,11 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 ## Obj-C/Swift specific