diff options
Diffstat (limited to 'admin/notes/git-workflow')
| -rw-r--r-- | admin/notes/git-workflow | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index 92dc79127e3..3c2c76c8909 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow | |||
| @@ -33,7 +33,7 @@ You now have both branches conveniently accessible, and you can do | |||
| 33 | Fixing bugs | 33 | Fixing bugs |
| 34 | =========== | 34 | =========== |
| 35 | 35 | ||
| 36 | You edit the files in either branch, `M-x vc-dir', and check in your | 36 | You edit the files in either branch, 'M-x vc-dir', and check in your |
| 37 | changes. Then you need to push the data to the main repository. This | 37 | changes. Then you need to push the data to the main repository. This |
| 38 | will usually fail, since somebody else has pushed other changes in the | 38 | will usually fail, since somebody else has pushed other changes in the |
| 39 | meantime. To fix this, say | 39 | meantime. To fix this, say |