From d8a6aaf775519a1dcb9e35ce1321895548d4558e Mon Sep 17 00:00:00 2001 From: Alex Van Liew Date: Sun, 27 Oct 2013 03:40:26 -0700 Subject: [PATCH] Updated the conflict level to make more sense for the user. --- levels/conflict.rb | 6 +++--- levels/conflict/.githug/COMMIT_EDITMSG | 15 +++++++++++++-- levels/conflict/.githug/index | Bin 104 -> 104 bytes levels/conflict/.githug/logs/HEAD | 6 ++++++ levels/conflict/.githug/logs/refs/heads/master | 2 ++ .../conflict/.githug/logs/refs/heads/mybranch | 2 ++ .../1d/b9aa5013e47f1482ec90323d926171a99c28af | Bin 0 -> 55 bytes .../30/cc28e66966109bb5bfbe96d6c817c367d2050a | Bin 0 -> 163 bytes .../3c/b65bef44ae724ddf9e89640e7e2754dea1a47f | Bin 0 -> 73 bytes .../3d/7aec017559be2b61cab850dafdcb2b6212f1c3 | 1 + .../55/ad5af2a93afa778971e3d04faf20f6c368b6ba | Bin 0 -> 53 bytes .../bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1 | 2 ++ .../c7/97f979cf24ba148bf10d5e26f5d7402dd5f2e1 | Bin 0 -> 196 bytes .../da/ae380200ed6eeaafd926177018e8ff3009b988 | Bin 0 -> 53 bytes levels/conflict/.githug/refs/heads/master | 2 +- levels/conflict/.githug/refs/heads/mybranch | 2 +- levels/conflict/poem.txt | 2 +- 17 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 levels/conflict/.githug/objects/1d/b9aa5013e47f1482ec90323d926171a99c28af create mode 100644 levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a create mode 100644 levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f create mode 100644 levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3 create mode 100644 levels/conflict/.githug/objects/55/ad5af2a93afa778971e3d04faf20f6c368b6ba create mode 100644 levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1 create mode 100644 levels/conflict/.githug/objects/c7/97f979cf24ba148bf10d5e26f5d7402dd5f2e1 create mode 100644 levels/conflict/.githug/objects/da/ae380200ed6eeaafd926177018e8ff3009b988 diff --git a/levels/conflict.rb b/levels/conflict.rb index 1001cb90..d86f10e2 100644 --- a/levels/conflict.rb +++ b/levels/conflict.rb @@ -12,12 +12,12 @@ solved = false unless repo.commits("master")[0].parents.length == 2 txt = `cat poem.txt` - solved = false if txt =~ /[<>=]/ - solved = false if txt =~ /cool poem/ + solved = false if txt =~ /[<>=|]/ + solved = false unless txt =~ /Sat on a wall/ solved end hint do - puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in poem.txt, leaving the correct version of the poem."] + puts ["First you have to do a merge. Then resolve any conflicts and finish the merge", "Take a look at the sections on merge conflicts in 'git merge'.", "Remove the unnecessary lines in poem.txt, so only the correct poem remains."] end diff --git a/levels/conflict/.githug/COMMIT_EDITMSG b/levels/conflict/.githug/COMMIT_EDITMSG index 5b8f88ce..b5233e55 100644 --- a/levels/conflict/.githug/COMMIT_EDITMSG +++ b/levels/conflict/.githug/COMMIT_EDITMSG @@ -1,3 +1,14 @@ -Added comment +Updated the poem -Signed-off-by: Thameera Senanayaka +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Author: Thameera Senanayaka +# Committer: Alex +# +# On branch master +# Changes to be committed: +# (use "git reset HEAD^1 ..." to unstage) +# +# modified: poem.txt +# diff --git a/levels/conflict/.githug/index b/levels/conflict/.githug/index index d947cd06309e0ecb9e3c4bdba09146be0862e445..da6ef5ad5bf317966de0d970a5d50482238121f3 100644 GIT binary patch literal 104 zcmZ?q402{*U|<4b#-N;MvTWNTKZ9w%Z*LhG{xUGINo`=fPCG`v(1^KDDdL>TsX 1352041213 +0530 commit: Added lines 50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka 1352041234 +0530 commit: Added comment 75179304f4fab00613f08a9412b6cb0965bfa564 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka 1352041240 +0530 checkout: moving from mybranch to master +40e20a455ac2731ad25c297b03aa543d7eedf6ab 75179304f4fab00613f08a9412b6cb0965bfa564 Alex 1382868220 -0700 checkout: moving from master to mybranch +75179304f4fab00613f08a9412b6cb0965bfa564 bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 Alex 1382868333 -0700 commit: Changed the poem +bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 3d7aec017559be2b61cab850dafdcb2b6212f1c3 Alex 1382868450 -0700 commit (amend): Changed the poem +3d7aec017559be2b61cab850dafdcb2b6212f1c3 40e20a455ac2731ad25c297b03aa543d7eedf6ab Alex 1382868483 -0700 checkout: moving from mybranch to master +40e20a455ac2731ad25c297b03aa543d7eedf6ab 30cc28e66966109bb5bfbe96d6c817c367d2050a Alex 1382868518 -0700 commit: Updated the poem +30cc28e66966109bb5bfbe96d6c817c367d2050a c797f979cf24ba148bf10d5e26f5d7402dd5f2e1 Alex 1382868533 -0700 commit (amend): Updated the poem diff --git a/levels/conflict/.githug/logs/refs/heads/master b/levels/conflict/.githug/logs/refs/heads/master index 6081993a..d818e9a9 100644 --- a/levels/conflict/.githug/logs/refs/heads/master +++ b/levels/conflict/.githug/logs/refs/heads/master @@ -1,2 +1,4 @@ 0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka 1352041121 +0530 commit (initial): Initial commit 306868e3258be1f35ae43db71e3a6d7edf42ffe7 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka 1352041153 +0530 commit: Added two lines +40e20a455ac2731ad25c297b03aa543d7eedf6ab 30cc28e66966109bb5bfbe96d6c817c367d2050a Alex 1382868518 -0700 commit: Updated the poem +30cc28e66966109bb5bfbe96d6c817c367d2050a c797f979cf24ba148bf10d5e26f5d7402dd5f2e1 Alex 1382868533 -0700 commit (amend): Updated the poem diff --git a/levels/conflict/.githug/logs/refs/heads/mybranch b/levels/conflict/.githug/logs/refs/heads/mybranch index 2b79affb..55cf0e0b 100644 --- a/levels/conflict/.githug/logs/refs/heads/mybranch +++ b/levels/conflict/.githug/logs/refs/heads/mybranch @@ -1,3 +1,5 @@ 0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka 1352041133 +0530 branch: Created from master 306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka 1352041213 +0530 commit: Added lines 50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka 1352041234 +0530 commit: Added comment +75179304f4fab00613f08a9412b6cb0965bfa564 bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 Alex 1382868333 -0700 commit: Changed the poem +bdc7bec8acae9b3eabf0a15b223a48211b7a89a1 3d7aec017559be2b61cab850dafdcb2b6212f1c3 Alex 1382868450 -0700 commit (amend): Changed the poem diff --git a/levels/conflict/.githug/objects/1d/b9aa5013e47f1482ec90323d926171a99c28af b/levels/conflict/.githug/objects/1d/b9aa5013e47f1482ec90323d926171a99c28af new file mode 100644 index 0000000000000000000000000000000000000000..a2353bc9f427845f0cbd184a301906395fa7ab53 GIT binary patch literal 55 zcmV-70LcG%0ZYosPf{?oWbi1>Ehwo}NC8t^!HFdb`FRS73gwA8Ib5i69*HSHiS(jW Npqez0Gyn=57T|qW79aos literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a b/levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a new file mode 100644 index 0000000000000000000000000000000000000000..af4ed40bd9ed21557017f1ecb8e6b7103830f998 GIT binary patch literal 163 zcmV;U09^lg0iBLp3c@fD0R7G>_5wa!Q%f|BZR?kVa;x;3Z=f*f;DS{F&eBUM((%~&zgj$( ROr10Ikzr|E#Si}mObmVSPNx6> literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f b/levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f new file mode 100644 index 0000000000000000000000000000000000000000..4a4cc37d0b47e2155c1d3a7bf8754d06493cd89c GIT binary patch literal 73 zcmV-P0Ji^l0ZYosPf{>9X7DJ@Ehwo}NC8t^&WRG?&ORjDZo#Togj#R^H43d#97 f`9)l)3Oy226cQEEi&7Iy6w(rNa=5qvo#7l^gGU~> literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3 b/levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3 new file mode 100644 index 00000000..eaca4326 --- /dev/null +++ b/levels/conflict/.githug/objects/3d/7aec017559be2b61cab850dafdcb2b6212f1c3 @@ -0,0 +1 @@ +x=[JC1E(,'8ISz4:z/R,XZ/QOs0C"bQ!rD9es(=5b{qm[ M6":`v3-(T;7jMW|@\^_@jZkxF(v9V=y!@Ff%bxD9BIE)hnqeVX)a2{oZ9=k?;L^ohf{E>LK?Q LE~y6qLzWQ86UG(F literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1 b/levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1 new file mode 100644 index 00000000..98ae9b8d --- /dev/null +++ b/levels/conflict/.githug/objects/bd/c7bec8acae9b3eabf0a15b223a48211b7a89a1 @@ -0,0 +1,2 @@ +xA +0@Q9\@dd"'4[h =y,SGth*d%F٫!eR1l 6D®tET%v%?$OEzynpZ:A汾i\ XbǞͰ?6O(C3QYu1?6lJ \ No newline at end of file diff --git a/levels/conflict/.githug/objects/c7/97f979cf24ba148bf10d5e26f5d7402dd5f2e1 b/levels/conflict/.githug/objects/c7/97f979cf24ba148bf10d5e26f5d7402dd5f2e1 new file mode 100644 index 0000000000000000000000000000000000000000..bc6d1fabbd0fe560ea78776a74109486c64c32a4 GIT binary patch literal 196 zcmV;#06YJ90Y#2&O2jY}Mg84XybU;{dHE^~GOj^gz-{tk2b-pJBB-l3$bkPY2hQQf zTFSMNHu|9*B4jO+Mb?-Y8QzDGYh;vY1=F>tJ&#D*Mm_mi zF<=cRFOssuJm9k}^`O@UMdSdz$c7Ey_yC>T9gdnW?*-TO6l-~+k%JB{*fG$f@=6Vz y_One6dS2y=&bO`BpUYY!)}`Ls>2Ial3){cVe7A?UJ)udWwg~N2%J2(`N={?hXk)bi literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/objects/da/ae380200ed6eeaafd926177018e8ff3009b988 b/levels/conflict/.githug/objects/da/ae380200ed6eeaafd926177018e8ff3009b988 new file mode 100644 index 0000000000000000000000000000000000000000..79ff26ca41191886b1f7b73a18d32d058722f150 GIT binary patch literal 53 zcmV-50LuS(0V^p=O;s>9V=y!@Ff%bxD9BIE)hnqeVUXRqDnR&2y-3rW2}ZV)5(`(( L(O3@vIu#HP^8*t8 literal 0 HcmV?d00001 diff --git a/levels/conflict/.githug/refs/heads/master b/levels/conflict/.githug/refs/heads/master index fe357f76..fef8d7a3 100644 --- a/levels/conflict/.githug/refs/heads/master +++ b/levels/conflict/.githug/refs/heads/master @@ -1 +1 @@ -40e20a455ac2731ad25c297b03aa543d7eedf6ab +c797f979cf24ba148bf10d5e26f5d7402dd5f2e1 diff --git a/levels/conflict/.githug/refs/heads/mybranch b/levels/conflict/.githug/refs/heads/mybranch index b38ada85..0fb8f6bd 100644 --- a/levels/conflict/.githug/refs/heads/mybranch +++ b/levels/conflict/.githug/refs/heads/mybranch @@ -1 +1 @@ -75179304f4fab00613f08a9412b6cb0965bfa564 +3d7aec017559be2b61cab850dafdcb2b6212f1c3 diff --git a/levels/conflict/poem.txt b/levels/conflict/poem.txt index 4430fd3f..3cb65bef 100644 --- a/levels/conflict/poem.txt +++ b/levels/conflict/poem.txt @@ -1,5 +1,5 @@ Humpty dumpty -Sat on a wall +Categorized shoes by color Humpty dumpty Had a great fall