@@ -72,13 +72,13 @@ are ready to work on a bug or a new feature create yourself a new branch. The reason why this is important is you can commit as often you like. When you are ready you can merge in the change. Let's take a look at a common workflow:: - git checkout -b task-1 + git checkout -b task-1-work ... do work and git commit often ... - git push origin task-1 - git checkout -b task-1-ready - git merge --squash --no-commit task-1 + git push origin task-1-work + git checkout -b task-1 + git merge --squash --no-commit task-1-work git commit -m "Fixed #1 — added a great new feature" - git push origin task-1-ready + git push origin task-1 The reason we have created two new branches is to stay off of ``master``. Keeping master clean of only upstream changes makes yours and ours lives @@ -88,12 +88,12 @@ individual commits for why you may have done something. If we say that you've done something slightly wrong you can now go back to the ``task-1`` branch and correct it. Let's see how we might do this:: - git checkout -b task-1 + git checkout -b task-1-work ... fix and git commit often ... git push - git branch -D task-1-ready - git checkout -b task-1-ready - git merge --squash --no-commit task-1 + git branch -D task-1 + git checkout -b task-1 + git merge --squash --no-commit task-1-work git commit -m "Fixed #1 — added a great new feature" git push docs/contributing.txt 385bd14a3479c0e61ec57ebb74abf27ad54d5683 Brian Rosner brosner@gmail.com http://github.com/pinax/pinax/commit/d7daecdcdc1d43c8bdec841a52b1c4f5f44c1f84 d7daecdcdc1d43c8bdec841a52b1c4f5f44c1f84 2009-11-02T07:41:30-08:00 2009-11-02T07:41:30-08:00 Inverted the name of development branches in contributing documentation 5afc8bd8815c3bf24efa32e79c16edea683bd0ed Brian Rosner brosner@gmail.com