Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed indentation in developer.txt.

  • Loading branch information...
commit c0debd95bbbb1e9a5f1c21e6a60f197380b6d5a2 1 parent 4eff6d4
@brosner brosner authored
Showing with 18 additions and 18 deletions.
  1. +18 −18 docs/developers.txt
View
36 docs/developers.txt
@@ -17,7 +17,7 @@ Developers without Commit Privileges
Login to http://github.com and search for Pinax or go directly here::
- http://github.com/pinax/pinax/tree/master
+ http://github.com/pinax/pinax/tree/master
Getting the code
----------------
@@ -28,12 +28,12 @@ invokes a "Hardcore Forking Action".
Grab the "Your Clone" URL from the page, using the Flash button if you
have Flash. It gives you something like this::
- git@github.com:yourusername/pinax.git
+ git@github.com:yourusername/pinax.git
Clone this to your computer: in the current pinax-boot installation,
cd to src/ and then::
- git clone git@github.com:yourusername/pinax.git
+ git clone git@github.com:yourusername/pinax.git
Push your changes back
----------------------
@@ -42,7 +42,7 @@ Do your development in src/pinax, test, later, rinse, repeat. When
you're satisfied with your changes, ``git commit`` them to your local
repository copy and send it back up to your fork on Github::
- git push
+ git push
When you're ready for the committers to review your changes for
acceptance, go to your fork on Github (e.g.,
@@ -53,28 +53,28 @@ Keep in sync with the main pinax master
---------------------------------------
Add a name for the pinax master git location::
-
- $ git remote add pinaxmaster git://github.com/pinax/pinax.git
+
+ $ git remote add pinaxmaster git://github.com/pinax/pinax.git
This adds an entry to your existing local copy's .git/config like::
-
- [remote "pinaxmaster"]
- url = git://github.com/pinax/pinax.git
- fetch = +refs/heads/*:refs/remotes/pinaxmaster/*
+
+ [remote "pinaxmaster"]
+ url = git://github.com/pinax/pinax.git
+ fetch = +refs/heads/*:refs/remotes/pinaxmaster/*
Then pull from the master and merge changes in::
- $ git pull pinaxmaster master
+ $ git pull pinaxmaster master
You may see merge conflicts like::
- From git://github.com/pinax/pinax
- * branch master -> FETCH_HEAD
- Auto-merging docs/install.txt
- CONFLICT (content): Merge conflict in docs/install.txt
- Auto-merging requirements/external_apps.txt
- CONFLICT (content): Merge conflict in requirements/external_apps.txt
- Automatic merge failed; fix conflicts and then commit the result.
+ From git://github.com/pinax/pinax
+ * branch master -> FETCH_HEAD
+ Auto-merging docs/install.txt
+ CONFLICT (content): Merge conflict in docs/install.txt
+ Auto-merging requirements/external_apps.txt
+ CONFLICT (content): Merge conflict in requirements/external_apps.txt
+ Automatic merge failed; fix conflicts and then commit the result.
Now resolve the conflicts with your editor. You'll need to ``git add``
the files again before you can ``commit``, ``push`` and issue pull
Please sign in to comment.
Something went wrong with that request. Please try again.