Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update the development docs to remove mention of dev branch

  • Loading branch information...
commit 55d193dae526724dd76528cf814707114a4246ce 1 parent e386b03
Aron Carroll aron authored
Showing with 14 additions and 9 deletions.
  1. +14 −9 docs/development.md
23 docs/development.md
View
@@ -1,12 +1,10 @@
Git
---
-We have two main branches on the jsbin repository.
+We have only one main branch in the JS Bin repository.
-- master: Contains the very latest stable version of JSBin. This is the one
+- master: Contains the very latest stable version of JS Bin. This is the one
that will be live at the moment.
-- development: The currently in development version. This should be stable
- but y'know it might not be.
All features should be created in a new branch named
`feature/description-of-feature` eg. `feature/preprocessors`. A pull request
@@ -20,7 +18,7 @@ here][#am]. GitHub [happily generates][#ex] this patch by applying `.patch`
to the pull request url.
So to check a pull request does what it says it does you'll probably go
-through a couple of steps. From the development branch create a test branch:
+through a couple of steps. From the master branch create a test branch:
$ git checkout -b pull-request-123 # Create a test branch
@@ -28,12 +26,12 @@ Then apply the users patch:
$ curl https://github.com/remy/jsbin/pull/123.patch | git am
-Then run and check the code works. If all's good merge it into development
+Then run and check the code works. If all's good merge it into master
and push it up to GitHub.
- $ git checkout development # Jump back to development
+ $ git checkout master # Jump back to master
$ git merge pull-request-123 # Merge the pull request in
- $ git push origin development # Push it up to GitHub
+ $ git push origin master # Push it up to GitHub
$ git branch -D pull-request-123 # Delete your testing branch
And you're done.
@@ -42,10 +40,17 @@ If for some reason the code fails to apply or it doesn't do what you expect
you can just delete the test branch.
$ git am --abort # Abort if the patch failed to apply
- $ git checkout development # Jump back to development
+ $ git checkout master # Jump back to master
$ git branch -D pull-request-123 # Delete the broken test branch
Then in the pull request let the original author know what went wrong.
+Deleting branches on GitHub
+---------------------------
+
+To delete a branch on GitHub you use the following command:
+
+ $ git push origin :<branch-to-delete>
+
[#am]: http://git-scm.com/book/ch5-3.html#Applying-Patches-from-E-mail
[#ex]: https://github.com/remy/jsbin/pull/190.patch
Please sign in to comment.
Something went wrong with that request. Please try again.