README.md in pivotal-github-0.6.12 vs README.md in pivotal-github-0.6.14

@@ -76,10 +76,21 @@
     $ git fetch
     $ git rebase origin/master
 
 but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
 
+If you've already pushed the story, you'll have to force a subsequent push using
+
+    $ git push --force
+
+If someone else might already have pulled the branch, you should probably merge `master` instead of rebasing against it:
+
+    $ git story-push
+    $ git story-pull
+    $ git merge master
+ 
+
 #### Options
 
     Usage: git story-pull [options]
         -d, --development BRANCH         development branch (defaults to master)
         -h, --help                       this usage guide
@@ -181,10 +192,12 @@
 4. Continue pushing up after each commit using `git push` as usual
 4. When done with the story, add `-f` to mark the story as **Finished** using `git story-commit -f -am "Add paragraph breaks"` or as **Delivered** using `git story-commit -d -am "Add paragraph breaks"`
 4. Rebase against `master` using `git story-pull` followed by `git rebase master` or `git rebase master --interactive` (optionally squashing commit messages as described in the article [A Git Workflow for Agile Teams](http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html))
 4. Push up with `git push`
 6. At the GitHub page for the repo, select **Branches** and submit a pull request
-7. Go the story at Pivotal Tracker and change the **Owner** to Developer #2 (Bob)
+6. (On OS X, replace the previous two steps with `git story-pull-request`)
+6. Assign the pull request to Bob at GitHub
+7. On the Pivotal Tracker story, change the **Owner** to Developer #2 (Bob) and add a comment with the pull request URL
 8. Continue working, taking care to branch off of the current story branch if its changes are required to continue
 
 Rather than immediately submitting a pull request, Alice can also continue by branching off the previous story branch, working on a set of related features, and then issue Bob a pull request for the final branch when she reaches a natural stopping place.