From 083e308079b2658f9ab643911d4d4bf171d46cf7 Mon Sep 17 00:00:00 2001
From: Robert Sebescen <robert.sebescen@devtechgroup.com>
Date: Tue, 15 Mar 2016 19:50:28 +0100
Subject: [PATCH 1/3] People with first name shorter then 4 characters will be
 excluded.

---
 .../Employee.Test.Git.Merge/Services/TestService.cs         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
index 2a59180..52a49f1 100644
--- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
+++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
@@ -17,7 +17,11 @@ public TestService(ITestRepository testRepository)
 
         public List<string> PeopleNames()
         {
-            return _testRepository.GetPeopleNames();
+            var peopleNames = _testRepository.GetPeopleNames();
+
+            List<string> noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList();
+
+            return noShortFirstNames;
         }
     }
 }
\ No newline at end of file

From ff1d588a1fa537d458ea570c57e65a491689f69d Mon Sep 17 00:00:00 2001
From: Robert Sebescen <robert.sebescen@devtechgroup.com>
Date: Tue, 15 Mar 2016 19:51:15 +0100
Subject: [PATCH 2/3] All people names will be uppercased.

---
 .../Employee.Test.Git.Merge/Services/TestService.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
index 2a59180..8050f14 100644
--- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
+++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
@@ -17,7 +17,7 @@ public TestService(ITestRepository testRepository)
 
         public List<string> PeopleNames()
         {
-            return _testRepository.GetPeopleNames();
+            return _testRepository.GetPeopleNames().Select(name => name.ToUpper()).ToList();
         }
     }
 }
\ No newline at end of file

From c7c4ea649ac10cfa57b5a69b686e4b3804f17799 Mon Sep 17 00:00:00 2001
From: Stefan <dr_ja_sl@hotmail.com>
Date: Thu, 30 Mar 2017 13:04:07 +0200
Subject: [PATCH 3/3] from 3 to 4

---
 .../Employee.Test.Git.Merge/Services/TestService.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
index e716f99..b6932b7 100644
--- a/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
+++ b/Employee.Test.Git.Merge/Employee.Test.Git.Merge/Services/TestService.cs
@@ -22,7 +22,7 @@ public List<string> PeopleNames()
 
             var peopleNames = _testRepository.GetPeopleNames();
 
-            List<string> noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 3).ToList();
+            List<string> noShortFirstNames = peopleNames.Where(name => name.Split(' ')[0].Length > 4).ToList();
 
             return noShortFirstNames;