githug 0.2.10 → 0.2.11

data/levels/checkout_tag.rb

@@ -0,0 +1,39 @@
+difficulty 2
+
+description "You need to fix a bug in the version 1.2 of your app. Checkout the tag v1.2"
+
+setup do
+  repo.init
+  FileUtils.touch("app.rb")
+  repo.add("app.rb")
+  repo.commit_all("Initial commit")
+
+  `echo "Some code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Some changes")
+  repo.git.tag( { 'f' => true }, "v1.0" )
+
+  `echo "Buggy code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Some more changes")
+  repo.git.tag( { 'f' => true }, "v1.2" )
+
+  `echo "More code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Yet more changes")
+
+  `echo "Some more code" >> app.rb`
+  repo.add("app.rb")
+  repo.commit_all("Changes galore")
+  repo.git.tag( { 'f' => true }, "v1.5" )
+end
+
+solution do
+  return false unless repo.commits.length == 5
+  return false unless `git show HEAD` =~ /Some more changes/
+  true
+end
+
+hint do
+  puts "There's no big difference between checking out a branch and checking out a tag"
+end

data/levels/conflict.rb

@@ -0,0 +1,23 @@
+difficulty 4
+description "You need to merge the current branch (master) with 'mybranch'. But there may be some incorrect changes in 'mybranch' which may cause conflicts. Solve any merge-conflicts you come across and finish the merge."
+
+setup do
+  init_from_level
+end
+
+solution do
+  solved = true
+
+  solved = false unless repo.head.name == "master"
+  solved = false unless repo.commits("master")[0].parents.length == 2
+
+  txt = `cat poem.txt`
+  solved = false if txt =~ /[<>=]/
+  solved = false unless txt =~ /cool poem/
+
+  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."]
+end

data/levels/conflict/.githug/COMMIT_EDITMSG

@@ -0,0 +1,3 @@
+Added comment
+
+Signed-off-by: Thameera Senanayaka <thameera123@gmail.com>

data/levels/conflict/.githug/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/levels/conflict/.githug/config

@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true

data/levels/conflict/.githug/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/levels/conflict/.githug/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/levels/conflict/.githug/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/levels/conflict/.githug/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/levels/conflict/.githug/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/levels/conflict/.githug/hooks/pre-commit.sample

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/levels/conflict/.githug/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END

data/levels/conflict/.githug/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

data/levels/conflict/.githug/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/levels/conflict/.githug/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/levels/conflict/.githug/logs/HEAD

@@ -0,0 +1,6 @@
+0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041121 +0530	commit (initial): Initial commit
+306868e3258be1f35ae43db71e3a6d7edf42ffe7 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka <thameera123@gmail.com> 1352041153 +0530	commit: Added two lines
+40e20a455ac2731ad25c297b03aa543d7eedf6ab 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041162 +0530	checkout: moving from master to mybranch
+306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka <thameera123@gmail.com> 1352041213 +0530	commit: Added lines
+50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka <thameera123@gmail.com> 1352041234 +0530	commit: Added comment
+75179304f4fab00613f08a9412b6cb0965bfa564 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka <thameera123@gmail.com> 1352041240 +0530	checkout: moving from mybranch to master

data/levels/conflict/.githug/logs/refs/heads/master

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041121 +0530	commit (initial): Initial commit
+306868e3258be1f35ae43db71e3a6d7edf42ffe7 40e20a455ac2731ad25c297b03aa543d7eedf6ab Thameera Senanayaka <thameera123@gmail.com> 1352041153 +0530	commit: Added two lines

data/levels/conflict/.githug/logs/refs/heads/mybranch

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 306868e3258be1f35ae43db71e3a6d7edf42ffe7 Thameera Senanayaka <thameera123@gmail.com> 1352041133 +0530	branch: Created from master
+306868e3258be1f35ae43db71e3a6d7edf42ffe7 50a127cb066eb903a6fa59d71802c10cb442fb3b Thameera Senanayaka <thameera123@gmail.com> 1352041213 +0530	commit: Added lines
+50a127cb066eb903a6fa59d71802c10cb442fb3b 75179304f4fab00613f08a9412b6cb0965bfa564 Thameera Senanayaka <thameera123@gmail.com> 1352041234 +0530	commit: Added comment

data/levels/conflict/.githug/objects/2d/0d90051e320215f54f357e746c9838490557e7

@@ -0,0 +1 @@
+x
+)JMU06c040031Q(�O��+�(apK�LyV����i.G�1�Z��
>��

data/levels/conflict/.githug/objects/6b/0c0b32bdca3af9beb831744cb755d6fdc7c7c0

@@ -0,0 +1,2 @@
+x
U��	�0EQש�U 
+� `3~`�	�vop'\��cE-�a��cyྙ�E�
�"��Gb*ة�Y�+�E�TQكoN�F>���0�Л��&�

data/levels/conflict/.githug/objects/75/179304f4fab00613f08a9412b6cb0965bfa564

@@ -0,0 +1,2 @@
+x
��Kn�@@Y�)��@�瓤�=\��q j'A�t��I�^�b�O��֩��~�V3�=��8G�RQ"b
+�m�Y�%��� �?]�L߇��#���a�
�0zt�b���q��X�_۶��y��V��8�����D���b�

data/levels/conflict/.githug/objects/88/e0473c9da347c6311f5f8eca8d256bf25402b6

@@ -0,0 +1,2 @@
+x
+)JMU06c040031Q(�O��+�(ap1�k�z��Y�)�x׌���
+
/��

data/levels/conflict/.githug/refs/heads/master

@@ -0,0 +1 @@
+40e20a455ac2731ad25c297b03aa543d7eedf6ab

data/levels/conflict/.githug/refs/heads/mybranch

@@ -0,0 +1 @@
+75179304f4fab00613f08a9412b6cb0965bfa564

data/levels/conflict/poem.txt

@@ -0,0 +1,5 @@
+Humpty dumpty
+Sat on a wall
+Humpty dumpty
+Had a great fall
+

data/lib/githug/level.rb

@@ -6,10 +6,10 @@ module Githug
               "clone_to_folder", "ignore", "status", "rm", "rm_cached",
               "rename", "log", "tag",  "commit_amend", "reset", "reset_soft",
               "checkout_file", "remote", "remote_url", "pull", "remote_add",
-              "push", "diff", "blame", "branch", "checkout", "branch_at", "merge",
-              "cherry-pick", "rename_commit", "squash", "merge_squash", "reorder",
-              "bisect", "stage_lines", "find_old_branch", "revert", "restore",
-              "contribute"]
+              "push", "diff", "blame", "branch", "checkout", "checkout_tag",
+              "branch_at", "merge", "cherry-pick", "rename_commit", "squash",
+              "merge_squash", "reorder", "bisect", "stage_lines",
+              "find_old_branch", "revert", "restore", "conflict", "contribute"]
 
     attr_accessor :level_no, :level_path
     

data/lib/githug/version.rb

@@ -1,3 +1,3 @@
 module Githug
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -2,7 +2,7 @@
 name: githug
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
 - Gary Rennie
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-25 00:00:00 Z
+date: 2012-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -144,6 +144,7 @@ files:
 - levels/branch_at.rb
 - levels/checkout.rb
 - levels/checkout_file.rb
+- levels/checkout_tag.rb
 - levels/cherry-pick.rb
 - levels/cherry-pick/.githug/COMMIT_EDITMSG
 - levels/cherry-pick/.githug/HEAD
@@ -196,6 +197,39 @@ files:
 - levels/commit.rb
 - levels/commit_amend.rb
 - levels/config.rb
+- levels/conflict.rb
+- levels/conflict/.githug/COMMIT_EDITMSG
+- levels/conflict/.githug/HEAD
+- levels/conflict/.githug/config
+- levels/conflict/.githug/description
+- levels/conflict/.githug/hooks/applypatch-msg.sample
+- levels/conflict/.githug/hooks/commit-msg.sample
+- levels/conflict/.githug/hooks/post-update.sample
+- levels/conflict/.githug/hooks/pre-applypatch.sample
+- levels/conflict/.githug/hooks/pre-commit.sample
+- levels/conflict/.githug/hooks/pre-rebase.sample
+- levels/conflict/.githug/hooks/prepare-commit-msg.sample
+- levels/conflict/.githug/hooks/update.sample
+- levels/conflict/.githug/index
+- levels/conflict/.githug/info/exclude
+- levels/conflict/.githug/logs/HEAD
+- levels/conflict/.githug/logs/refs/heads/master
+- levels/conflict/.githug/logs/refs/heads/mybranch
+- levels/conflict/.githug/objects/25/b3f9c339430b35ae5822b2ef90e763284dc007
+- levels/conflict/.githug/objects/2d/0d90051e320215f54f357e746c9838490557e7
+- levels/conflict/.githug/objects/30/6868e3258be1f35ae43db71e3a6d7edf42ffe7
+- levels/conflict/.githug/objects/38/21e4362c5a76db1112b46b9210670cd5bab482
+- levels/conflict/.githug/objects/40/e20a455ac2731ad25c297b03aa543d7eedf6ab
+- levels/conflict/.githug/objects/44/30fd3f45c832e685350417600a9862c94d20f1
+- levels/conflict/.githug/objects/46/677964e679f3e727356d0860c643a12a87902b
+- levels/conflict/.githug/objects/50/a127cb066eb903a6fa59d71802c10cb442fb3b
+- levels/conflict/.githug/objects/6b/0c0b32bdca3af9beb831744cb755d6fdc7c7c0
+- levels/conflict/.githug/objects/75/179304f4fab00613f08a9412b6cb0965bfa564
+- levels/conflict/.githug/objects/7c/36daf29660ae4a2f09345427ef76f1d38f902f
+- levels/conflict/.githug/objects/88/e0473c9da347c6311f5f8eca8d256bf25402b6
+- levels/conflict/.githug/refs/heads/master
+- levels/conflict/.githug/refs/heads/mybranch
+- levels/conflict/poem.txt
 - levels/contribute.rb
 - levels/diff.rb
 - levels/diff/.githug/COMMIT_EDITMSG