From f61327674dad47f4113f32d19f794fe5dbd0331f Mon Sep 17 00:00:00 2001 From: Vishwas Soman Date: Mon, 28 Sep 2026 10:30:36 -0500 Subject: [PATCH 1/3] My First attempt changing README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 112b874d..38f82884 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ 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. -## Make changes +## This is the first trial attempt. The official [docsify documentation](https://docsify.js.org/#/?id=docsify) is your best bet for getting up to speed with the tool. From 1c549294681b5871bdc7d5efc328f728f03c95c8 Mon Sep 17 00:00:00 2001 From: vsoman1 Date: Mon, 28 Sep 2026 10:42:20 -0500 Subject: [PATCH 2/3] Updated as per the comments Updated the trial attempt note to indicate it looks good. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38f82884..fa98ed4f 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ 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. -## This is the first trial attempt. +## This is the first trial attempt. Looks good! The official [docsify documentation](https://docsify.js.org/#/?id=docsify) is your best bet for getting up to speed with the tool. From 262ca26887a516458540ad1f6aaf14ca284fc2b9 Mon Sep 17 00:00:00 2001 From: vsoman1 Date: Mon, 28 Sep 2026 13:44:08 -0500 Subject: [PATCH 3/3] Update README title for first comment Update README title for first comment in order to create conflict in the second branch. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa98ed4f..df897957 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GitHub Training Manual +# GitHub Training Manual - First conflict vsoman1-conflict [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)