From 410c70f96ef6f4013122731fa9e8c3827e5840d4 Mon Sep 17 00:00:00 2001 From: murraydr Date: Wed, 25 Oct 2023 12:51:55 -0400 Subject: [PATCH] format 3 --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 51778ce..01192e4 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,7 @@ Close Git bash and open Git Gui Click “Clone Existing Repository” and paste https://git.egr.msu.edu/CSE102/Substitution-Requests.git into the “Source Location” box. The “Target Directory” box is the path to the folder you want to store your local copy in. The folder must NOT already exist. - -E.g. “C:\Users\USERNAME\Substitution-Requests” will create the Substitution Requests folder and put all the files inside it. + (E.g. “C:\Users\USERNAME\Substitution-Requests” will create the Substitution Requests folder and put all the files inside it.) Open the Repo in GitGui (this might happen automatically after cloning). Click “Tools” and “Add” @@ -56,12 +55,12 @@ Once logged in, just click continue on each increasingly dire warning page until ## Daily Workflow: Ensure that nobody else is currently working on these files or sitting on unpushed changes -(This prevents merge conflicts and the need to redo work) + (This prevents merge conflicts and the need to redo work) Open Git Gui and click "Tools" and "Pull" (or whatever you named the pull command during configuration explained above) -(This updates your local copy to the repo's version) + (This updates your local copy to the repo's version) -run "driver.py" in whatever your Python setup is and when done, click "OK" to close and save changes +run "driver.py" in your Python environment and when done, click "OK" to close and save changes In Git Gui type a commit message and then click "Rescan", "Stage Changed", "Commit", and "Push" in that order.