From 1d7294dae4b87add2a2975980ae1bfe1f6b8e56d Mon Sep 17 00:00:00 2001 From: Colin Jones Date: Sat, 19 Feb 2011 09:37:02 -0800 Subject: [PATCH] Add tip about managing conflicts on long-running forks. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 413e38e..aa51a02 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,10 @@ Koans"). If you're starting from a cloned or forked repo, that's cool too. This way you'll be able to track your progress in Git, and see how your answers compare -to others, by checking out the project's Network tab. +to others, by checking out the project's Network tab. You might want to create your +own branch - that way if you pull back the latest koans from master, it'll be a bit +easier to manage the inevitable conflicts if we make changes to exercises you've already +completed. The only things you'll need to run the Clojure Koans are: