From 3935f8b4f67a49206227108bd5742340f35d65b3 Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 10:37:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=A7=A8?= =?UTF-8?q?=E5=A6=88=E5=8A=9F=E8=83=BD=E6=96=B0=E6=B3=A8=E5=86=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest/Base.lproj/Main.storyboard | 17 +++++++++++------ GitTest/ViewController.m | 7 ++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/GitTest/Base.lproj/Main.storyboard b/GitTest/Base.lproj/Main.storyboard index f56d2f3..81a10aa 100644 --- a/GitTest/Base.lproj/Main.storyboard +++ b/GitTest/Base.lproj/Main.storyboard @@ -1,21 +1,26 @@ - - + + + + + - + + + - + - + - + diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index 9d1dbd4..b3e33cd 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -16,12 +16,9 @@ @implementation ViewController - (void)viewDidLoad { [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. + // 这个工程只是用来学习Git相关技能的 + // 1.修复新注册用户A使用小姨妈功能后，B后进入小姨妈功能还是女性界面的问题。 } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} @end From f0a016e936ee931577caadbbcae5dfb892bbda09 Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 10:46:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest/ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index b3e33cd..12db23f 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -18,6 +18,7 @@ - (void)viewDidLoad { [super viewDidLoad]; // 这个工程只是用来学习Git相关技能的 // 1.修复新注册用户A使用小姨妈功能后，B后进入小姨妈功能还是女性界面的问题。 + // dev分支的修改 } From 60ad66f3697f1d95d00ecaeb4fb00f691304f4ab Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 10:50:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?dev=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest/ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index 12db23f..ead99e6 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -19,6 +19,7 @@ - (void)viewDidLoad { // 这个工程只是用来学习Git相关技能的 // 1.修复新注册用户A使用小姨妈功能后，B后进入小姨妈功能还是女性界面的问题。 // dev分支的修改 + // dev分支再次修改 } From 2ce7b8322097a3728a6fde1b0485d092a160b105 Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 13:36:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest/ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index ead99e6..93ee0fb 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -20,6 +20,7 @@ - (void)viewDidLoad { // 1.修复新注册用户A使用小姨妈功能后，B后进入小姨妈功能还是女性界面的问题。 // dev分支的修改 // dev分支再次修改 + // dev修改3 } From c292bfd5ce3c83275b97da007a215775c4b2ef4f Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 13:59:00 +0800 Subject: [PATCH 5/7] 12345 --- GitTest/ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index 93ee0fb..915d993 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -21,6 +21,7 @@ - (void)viewDidLoad { // dev分支的修改 // dev分支再次修改 // dev修改3 + // 123445 } From f75e5b46977b777a69d4ca96b715cbaed293fb41 Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 10:43:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9feature/module2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest/ViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index 915d993..d6cc154 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -22,6 +22,7 @@ - (void)viewDidLoad { // dev分支再次修改 // dev修改3 // 123445 + // 2.修改feature/module2并提交。 } From 1d4babee8cdbd05f35a7c67bb741db4d2dd440df Mon Sep 17 00:00:00 2001 From: Niu Yifei Date: Fri, 2 Dec 2016 14:12:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GitTest.xcodeproj/project.pbxproj | 6 ++++++ GitTest/JustTest.h | 13 +++++++++++++ GitTest/JustTest.m | 13 +++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 GitTest/JustTest.h create mode 100644 GitTest/JustTest.m diff --git a/GitTest.xcodeproj/project.pbxproj b/GitTest.xcodeproj/project.pbxproj index a48e05f..602581a 100644 --- a/GitTest.xcodeproj/project.pbxproj +++ b/GitTest.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ C866C3E91D07250700CD172E /* step5_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E11D07250700CD172E /* step5_3.jpg */; }; C866C3EA1D07250700CD172E /* step6_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E21D07250700CD172E /* step6_1.jpg */; }; C866C3EB1D07250700CD172E /* step6_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E31D07250700CD172E /* step6_2.jpg */; }; + D0FF57D11DF1481B0096F5F1 /* JustTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D0FF57D01DF1481B0096F5F1 /* JustTest.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -44,6 +45,8 @@ C866C3E11D07250700CD172E /* step5_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step5_3.jpg; sourceTree = ""; }; C866C3E21D07250700CD172E /* step6_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step6_1.jpg; sourceTree = ""; }; C866C3E31D07250700CD172E /* step6_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step6_2.jpg; sourceTree = ""; }; + D0FF57CF1DF1481B0096F5F1 /* JustTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JustTest.h; sourceTree = ""; }; + D0FF57D01DF1481B0096F5F1 /* JustTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JustTest.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,6 +82,8 @@ C866C3B61D07196900CD172E /* AppDelegate.h */, C866C3B71D07196900CD172E /* AppDelegate.m */, C866C3B91D07196900CD172E /* ViewController.h */, + D0FF57CF1DF1481B0096F5F1 /* JustTest.h */, + D0FF57D01DF1481B0096F5F1 /* JustTest.m */, C866C3BA1D07196900CD172E /* ViewController.m */, C866C3BC1D07196900CD172E /* Main.storyboard */, C866C3BF1D07196900CD172E /* Assets.xcassets */, @@ -188,6 +193,7 @@ C866C3BB1D07196900CD172E /* ViewController.m in Sources */, C866C3B81D07196900CD172E /* AppDelegate.m in Sources */, C866C3B51D07196900CD172E /* main.m in Sources */, + D0FF57D11DF1481B0096F5F1 /* JustTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/GitTest/JustTest.h b/GitTest/JustTest.h new file mode 100644 index 0000000..a90cd35 --- /dev/null +++ b/GitTest/JustTest.h @@ -0,0 +1,13 @@ +// +// JustTest.h +// GitTest +// +// Created by Simons on 2016/12/2. +// Copyright © 2016年 MikeBoom. All rights reserved. +// + +#import + +@interface JustTest : NSObject + +@end diff --git a/GitTest/JustTest.m b/GitTest/JustTest.m new file mode 100644 index 0000000..5131bee --- /dev/null +++ b/GitTest/JustTest.m @@ -0,0 +1,13 @@ +// +// JustTest.m +// GitTest +// +// Created by Simons on 2016/12/2. +// Copyright © 2016年 MikeBoom. All rights reserved. +// + +#import "JustTest.h" + +@implementation JustTest + +@end