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 d947cd06..da6ef5ad 100644 Binary files a/levels/conflict/.githug/index and b/levels/conflict/.githug/index differ diff --git a/levels/conflict/.githug/logs/HEAD b/levels/conflict/.githug/logs/HEAD index 24612eb7..8e8b5156 100644 --- a/levels/conflict/.githug/logs/HEAD +++ b/levels/conflict/.githug/logs/HEAD @@ -4,3 +4,9 @@ 306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka 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 00000000..a2353bc9 Binary files /dev/null and b/levels/conflict/.githug/objects/1d/b9aa5013e47f1482ec90323d926171a99c28af differ diff --git a/levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a b/levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a new file mode 100644 index 00000000..af4ed40b Binary files /dev/null and b/levels/conflict/.githug/objects/30/cc28e66966109bb5bfbe96d6c817c367d2050a differ diff --git a/levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f b/levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f new file mode 100644 index 00000000..4a4cc37d Binary files /dev/null and b/levels/conflict/.githug/objects/3c/b65bef44ae724ddf9e89640e7e2754dea1a47f differ 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(v