From a392ff81547c4cfa70b7fd120fa06536ea331cb8 Mon Sep 17 00:00:00 2001 From: Robert Sebescen Date: Tue, 15 Mar 2016 20:10:49 +0100 Subject: [PATCH 1/3] Updated README.md --- README.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b8dfafd..e272c50 100644 --- a/README.md +++ b/README.md @@ -1 +1,27 @@ -# merge-test \ No newline at end of file +Git Merge Challenge Task + +Purpose of this repository is to test your merging skills for DEVTECH's Challenge 2016. + +In order to do so you will need to do the following: +- Create GitHub account (if you do not have one) +- Fork this repository with you GitHub account +- Merge "allCapsedNames" and "excludeShortFirstNames" branches (not necessarily in this order) into the master branch on your account's repository +- Create pull request for your repository's master branch into this repository's master branch + +In order for you to better understand what has been commited on these branches read the storyline bellow. + +Initially there was a need to retrieve people's names. As it always happen, this was not the final implementation (http://goo.gl/J5P2PW). +Two developers, John and Mike, are working on this project. +Project manager have assigned one task for each of the developers. +Both of them created new branch from master branch and started implementing their tasks. + +John's task: "We hate worrying about the casing in the people's names, make them all upper cased!" +Mike's task: "Please exclude people who's first name is shorted than 3 letters because of reasons... One of them being that I am your manager and I(!) want you to do so!" + +They both have successfully completed their tasks, but the manager could not see these changes because they were not on the master branch. + +Your task is to fork this repository, merge these branches into master branch on your repository and create a pull request. + +Cheers + +Note: If you fail at your first attempt you can commit new changes and try again (and again, and again...). \ No newline at end of file From 93cd17c08de795b49f5bb0e35d95b5a048ee004d Mon Sep 17 00:00:00 2001 From: Robert Sebescen Date: Wed, 16 Mar 2016 11:47:10 +0100 Subject: [PATCH 2/3] Changed the allowed length of first names for Mike's task --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e272c50..92349dc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Project manager have assigned one task for each of the developers. Both of them created new branch from master branch and started implementing their tasks. John's task: "We hate worrying about the casing in the people's names, make them all upper cased!" -Mike's task: "Please exclude people who's first name is shorted than 3 letters because of reasons... One of them being that I am your manager and I(!) want you to do so!" +Mike's task: "Please exclude people who's first name is shorted than 4 letters because of reasons... One of them being that I am your manager and I(!) want you to do so!" They both have successfully completed their tasks, but the manager could not see these changes because they were not on the master branch. @@ -24,4 +24,4 @@ Your task is to fork this repository, merge these branches into master branch on Cheers -Note: If you fail at your first attempt you can commit new changes and try again (and again, and again...). \ No newline at end of file +Note: If you fail at your first attempt you can commit new changes and try again (and again, and again...). From 0db0f9ee7401e150eaeccfb8e39e4c1527b92964 Mon Sep 17 00:00:00 2001 From: Danijel Sudar Date: Wed, 29 Mar 2017 12:15:21 +0200 Subject: [PATCH 3/3] test 2 --- .../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 PeopleNames() { - return _testRepository.GetPeopleNames(); + return _testRepository.GetPeopleNames().Select(name => name.ToUpper()).ToList(); } } } \ No newline at end of file