Permalink
Browse files

a few more updates to the dev guide

  • Loading branch information...
1 parent ef40e41 commit ca307856a75846f342fbb9a513652e8c93ce8823 @vegashacker committed Nov 24, 2008
Showing with 11 additions and 2 deletions.
  1. +1 −1 scribblings/lp-dev-guide.html
  2. +10 −1 scribblings/lp-dev-guide.scrbl
@@ -68,4 +68,13 @@ I will then evaluate the patch, and if it all looks good, I'll merge it into the
@subsection{Keeping in sync with master}
-As you are developing on your branch, the code may be moving forward on mainline (@tt{vegashacker/master}).
+As you are developing on your branch, the code may be moving forward on mainline (@tt{vegashacker/master}). PLEASE HELP ME UPDATE THIS SECTION IF YOU GET THIS TO WORK. Something like this should do the trick:
+
+@verbatim{
+% git checkout YOUR_BRANCH (make sure you are on your branch)
+% git stash (if you have any changes that aren't checked in)
+% git pull . git://github.com/vegashacker/leftparen.git (not sure about this line because so far I've only tested it locally, on the same repo; this line should trigger the merge).
+% git stash apply (to re-apply the changes you stashed above)
+}
+
+Again, let me know if there's a better/correct way of doing this. You'll want to do this often (or, rather, as often as mainline moves forward).

0 comments on commit ca30785

Please sign in to comment.