From 3935f8b4f67a49206227108bd5742340f35d65b3 Mon Sep 17 00:00:00 2001
From: Niu Yifei <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 10:37:39 +0800
Subject: [PATCH 1/8] =?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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
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 <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 10:46:08 +0800
Subject: [PATCH 2/8] =?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 <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 10:50:44 +0800
Subject: [PATCH 3/8] =?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 <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 13:36:43 +0800
Subject: [PATCH 4/8] =?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 <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 13:59:00 +0800
Subject: [PATCH 5/8] 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 2b3b677325a575ec2a131bfcdffd3a16fe402e45 Mon Sep 17 00:00:00 2001
From: Niu Yifei <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 10:42:03 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9module1=E5=B9=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
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..c2ae614 100644
--- a/GitTest/ViewController.m
+++ b/GitTest/ViewController.m
@@ -22,6 +22,7 @@ - (void)viewDidLoad {
     // dev分支再次修改
     // dev修改3
     // 123445
+    // 2.修改feature/module1分支并提交。
 }
 
 

From 037ab5e4f8565435b7a9b292c849969446f8be47 Mon Sep 17 00:00:00 2001
From: Niu Yifei <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 10:48:33 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9feature?=
 =?UTF-8?q?/module1?=
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 c2ae614..e460202 100644
--- a/GitTest/ViewController.m
+++ b/GitTest/ViewController.m
@@ -23,6 +23,7 @@ - (void)viewDidLoad {
     // dev修改3
     // 123445
     // 2.修改feature/module1分支并提交。
+    // 3.再次修改feature/module1分支并提交。
 }
 
 

From a4b6739a02f8b62a6221d338ce30670fe4a34b51 Mon Sep 17 00:00:00 2001
From: Niu Yifei <yifei.niu@enai.im>
Date: Fri, 2 Dec 2016 13:59:47 +0800
Subject: [PATCH 8/8] 987

---
 GitTest/ViewController.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m
index e460202..e870ac1 100644
--- a/GitTest/ViewController.m
+++ b/GitTest/ViewController.m
@@ -24,6 +24,7 @@ - (void)viewDidLoad {
     // 123445
     // 2.修改feature/module1分支并提交。
     // 3.再次修改feature/module1分支并提交。
+    // 987
 }