Permalink
Browse files

Add tip about managing conflicts on long-running forks.

  • Loading branch information...
1 parent ae28d1d commit 1d7294dae4b87add2a2975980ae1bfe1f6b8e56d @trptcolin trptcolin committed Feb 19, 2011
Showing with 4 additions and 1 deletion.
  1. +4 −1 README.md
View
@@ -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:

0 comments on commit 1d7294d

Please sign in to comment.