diff --git a/devNotes/gitSetup.md b/devNotes/gitSetup.md index 42a5bff0c10961b522b1036937fe075d4a85ac6d..022c3049b5e2fa2df676d78c8fa99e9e1bdc3c42 100644 --- a/devNotes/gitSetup.md +++ b/devNotes/gitSetup.md @@ -28,14 +28,14 @@ 7. Checkout `pregmod-master` * Via terminal: `git checkout pregmod-master` -8. Make sure `fc-pregmod` tracks `upstream/master` +8. Make sure `fc-pregmod` tracks `upstream/pregmod-master` * Via terminal: `git branch -u upstream/pregmod-master` ## Typical cycle with Git: 1. Get changes from upstream * Via terminal: `git pull` - * If you don't get new commits from `upstream` repeat steps 4&5 of the setup. + * If you don't get new commits from `upstream` repeat steps 7 & 8 of the setup. 2. Checkout a new branch for your work * Via terminal: `git checkout -b <branch-name>`