Mouse

README.md

@@ -1,3 +1,13 @@
+git-game
+
+
+Looks like you resolved your conflict and found our branch, congrats!!
+
+Hmm...it seems this branch has a file that was seen before in another branch.
+Do you "remember" what it is?
+I think this file has something to do with the next clue, but it seems to be very ugly looking.
+Maybe if we compare the "diff"erences between this file and the file from before we'll know where to go next...
+=======
 Git Game Finish Line
 ==========
 
@@ -19,9 +29,9 @@ Well you:
 - resolved merged conflicts
 - saw issues with naming tags and branches the same name
 - updated a local repository from a remote repository
- 
- Version control systems like git are extremely important tools to learn and use, 
- Especially when collaborating on projects with other developers. 
+
+ Version control systems like git are extremely important tools to learn and use,
+ Especially when collaborating on projects with other developers.
  It is our hope that you continue to practice your git skills so that you can one day become the ultimate git master!
 
  Thanks for playing!

cool.cpp

@@ -0,0 +1,16 @@
+#include <iostream>
+
+using namespace std;
+
+int main()
+{
+   string mesg = "Hello! Who are you?";
+   string input;
+   cout << mesg << endl;
+   cin >> input;
+   cout << "Loops are fun!" << endl;
+   while(1);
+   string reply = "Well, " + input + ", we hope you are having fun with our git-game!";
+   cout << reply << endl; 
+}
+

nextclue_input.cpp

@@ -0,0 +1,10 @@
+#include <iostream>
+
+using namespace std;
+//Level 9
+int main()
+{
+    cout << "hope you resolved all your conflicts!!" << endl;
+    return 0;
+}
+

outputclue.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+if [ -z $1 ]; then 
+  echo "well, someone didn't want to run the script with a file...";
+  exit;
+fi
+
+file=$1
+bug=7c85d987a917c2a555d1391426978f05
+mesg="Level 7: \n Linus has been here...\nI love messing with these amateur programmers!!\nIf you want some real fun, then you should try resolving a conflict between this branch (tree) and code4life.\nI introduced a little bug that you should fix in the conflict. >:)\nAfter you merge these 2 files you should run the shell script again!!\n\nGood Luck!!!\n\n Hint: https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ "
+merges=$(git log --format=%h --merges | head -1)
+csum="md5sum"
+if [ $(echo "$OSTYPE" | grep darwin) ];then
+    csum="md5"
+fi
+
+if [ "$file" = "nextclue_input.cpp" ];then 
+  if [ ${merges} ]; then 
+    while read p; do 
+      for w in $p;do 
+        if [ `echo $w | $csum | awk '{print $1}'` = $bug ];then 
+          echo -e $mesg; 
+          exit; 
+        fi; 
+      done;
+    done < $file ;
+    echo -e "Well, congratulations!! You fixed my conflict!!\nIf you would like to continue, then you should checkout to the $(echo 90mP8ouQHsNe | tr -d '0-9A-Z') branch!!\n" ;
+   else 
+     echo -e $mesg; 
+     exit;
+   fi; 
+else 
+  echo "Looks like you passed in the wrong file";
+fi