diff --git a/cs-fundamentals/git.md b/cs-fundamentals/git.md index 9b225adc763a1d933ca7a8d4f682e60725c5127d..7b0c510c9a1d6fb2e5736e9337e50c0e40e66f76 100644 --- a/cs-fundamentals/git.md +++ b/cs-fundamentals/git.md @@ -51,13 +51,12 @@ You should already have completed these steps: After setup, complete the following: 1. Add a `.gitignore` file that excludes image and video files as per the **WARNINGS** section. Add, commit, and push. - -2. Create a new branch called "hello-branch" with the `branch` command and switch to it with the `checkout` command. Make an edit to a file while in this new branch and add, commit, push. - -3. Check out the page for your repo on Gitlab. You should see a drop-down menu under the repository title with the "main" and "hello-branch" branches. - -4. Back on your local copy, you should now `merge` "hello-branch" back into main and add, commit, push. - -5. As your deliverable, submit the URL to your commit history showing the new branch, and it's subsequent merge back into the main branch. +2. Create a new branch called "hello-branch" with the `branch` command and switch to it with the `checkout` command. +3. Make an edit to a file while in this new branch. +4. Add, commit, push. +5. Check out the page for your repo on Gitlab. You should see a drop-down menu under the repository title with the "main" and "hello-branch" branches. +6. Back on your local copy, you should now `merge` "hello-branch" back into main. +7. Add, commit, push. +8. As your deliverable, submit the URL to your commit history showing the new branch, and it's subsequent merge back into the main branch. This concludes the git-centric subunit, but your work with git will continue throughout this course/your career. Your evaluation for the git unit will also include your git commit history for your project. Using git, writing good commit messages, frequency of adds versus commits versus pushes, etc. will all be considered.