From a8769da0061c3aa3fcf7a05e1ded3f43324864d6 Mon Sep 17 00:00:00 2001 From: "John T. Knox" Date: Thu, 12 Feb 2026 23:45:22 -0500 Subject: [PATCH] Update SETUP.md (Git commit step) Update wording of git commit step. Tried to make it more instructional, less copy/paste. --- SETUP.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index 615298b..ddbff1f 100644 --- a/SETUP.md +++ b/SETUP.md @@ -65,7 +65,7 @@ Double check that your terminal is in your team repository (the `cd` command fro ## Step 5: Commit and push changes to repository (ONE PERSON). -Run the following commands. +As a reminder, these are the commands to do a git push. ```shell git add . @@ -79,6 +79,8 @@ git commit -m "Set up GitHub Actions." git push origin main ``` +*Remember, as with any commit and push, use `git pull` and `git status` as necessary to resolve any merge conflicts before pushing* + ## Step 6: Check that GitHub Actions succeeded. In GitHub, go to your repository and click on "Actions". Check that the workflows passed. Alternatively, in the main page for your repository, you should see the latest commit message at the top of the files, and either a red X or a green checkmark for the GitHub workflows.