From 8f4ff5d57492a3d6965c8f252172e4afb4c5e75a Mon Sep 17 00:00:00 2001 From: Neal Smith Date: Tue, 27 Oct 2026 10:49:48 -0500 Subject: [PATCH 1/3] Class project 1 step working locally --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 112b874d..3ce201c4 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The topic scope is limited to GitHub's core product features, on GitHub.com and These manuals are designed to be generated using [docsify](https://docsify.js.org). To get your own manuals up and running, all you have to do is: -1. Fork this repository +1. Fork this repository - This has already been done. 2. In your fork, click on **Settings** 3. Scroll down to the GitHub Pages section, and set **Source:** to `main branch /docs folder`. 4. Click **Save**. From 4366ba8fa65b5369baee940963302864f93d1b99 Mon Sep 17 00:00:00 2001 From: Neal Smith Date: Tue, 27 Oct 2026 11:01:05 -0500 Subject: [PATCH 2/3] Need reviewers --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3ce201c4..9633afbd 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ These manuals are designed to be generated using [docsify](https://docsify.js.or 4. Click **Save**. 5. Return to the GitHub Pages section of Settings, and you'll receive the URL of your published manual. +** Now trying to use reviewer function. + ## Make changes The official [docsify documentation](https://docsify.js.org/#/?id=docsify) is your best bet for getting up to speed with the tool. From af51fb33c9722e826964895099e0c4cacaaa68ab Mon Sep 17 00:00:00 2001 From: neal-smith-2 Date: Tue, 27 Oct 2026 11:31:35 -0500 Subject: [PATCH 3/3] Revise README for clarity on merge conflicts Updated instructions and added notes about merge conflicts. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9633afbd..4c981533 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ These manuals are designed to be generated using [docsify](https://docsify.js.or 4. Click **Save**. 5. Return to the GitHub Pages section of Settings, and you'll receive the URL of your published manual. -** Now trying to use reviewer function. +** Not reviewing now, creating changes to conflict with merges. -## Make changes +## Make changes Like a change from merge conflict 1 The official [docsify documentation](https://docsify.js.org/#/?id=docsify) is your best bet for getting up to speed with the tool.