Permalink
Browse files

Fixes typo in 2010-08-25-notes.markdown

  • Loading branch information...
1 parent 2627b2b commit 4a99a0895641b1250327406394382472952a26d8 @Potherca Potherca committed Dec 16, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/views/blog/posts/2010-08-25-notes.markdown
@@ -233,7 +233,7 @@ This means that if you pull down someone's notes, you edit any note in a
namespace locally and the other developer edits any note in that same namespace,
you're going to have a hard time getting them back in sync. When the second
person tries to push their notes it will look like a non-fast-forward just
-like a normal branch update, but unline a normal branch you can't just run
+like a normal branch update, but unlike a normal branch you can't just run
`git pull` and then try again. You have to check out your notes ref as if it
were a normal branch, which will look ridiculously confusing and then do the
merge and then switch back. It is do-able, but probably not something you

0 comments on commit 4a99a08

Please sign in to comment.