From bc320d2af62e70d9f98a38c610db75aafff614bb Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 20 May 2024 11:28:07 -0400
Subject: [PATCH 1/4] Updated git repo to clone in contributing docs

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 27f6efe..ff89a1f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@
 Git clone the repository:
 
 ```shell
-git clone https://github.com/pyscript/pyscript.git
+git clone https://github.com/pyscript/pyscript-cli.git
 ```
 
 (Recommended) Upgrade local pip:

From e438e785c3bda03250d581d4f237cdbb6501daf8 Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 20 May 2024 11:46:35 -0400
Subject: [PATCH 2/4] Updated contributing guide to follow gitflow

---
 CONTRIBUTING.md | 67 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff89a1f..2333105 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,30 +2,63 @@
 
 ## Developer setup
 
-Git clone the repository:
+* Create a [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) of the [PyScript-CLI github repository](https://github.com/pyscript/pyscript-cli/fork) to your own GitHub account.
 
-```shell
-git clone https://github.com/pyscript/pyscript-cli.git
-```
+* [Clone](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) your newly forked version of the PyScript-CLI repository onto your local development machine. For example, use this command in your terminal:
 
-(Recommended) Upgrade local pip:
+    ```sh
+    git clone https://github.com/<YOUR USERNAME>/pyscript-cli
+    ```
 
-```shell
-pip install --upgrade pip
-```
+    > **WARNING**: In the URL for the forked PyScript-CLI repository, remember to replace
+        `<YOUR USERNAME>` with your actual GitHub username.
 
-Make a virtualenv and activate it:
+* Change into the root directory of your newly cloned `pyscript-cli` repository:
 
-```shell
-python -m venv .venv
-source .venv/bin/activate
-```
+    ```sh
+    cd pyscript-cli
+    ```
 
-Install your local enviroment dependencies
+* Add the original PyScript-CLI repository as your `upstream` to allow you to keep your own fork up-to-date with the latest changes:
 
-```shell
-pip install -e ".[dev]"
-```
+    ```sh
+    git remote add upstream https://github.com/pyscript/pyscript-cli.git
+    ```
+
+* If the above fails, try this alternative:
+
+  ```sh
+  git remote remove upstream
+  ```
+
+  ```sh
+  git remote add upstream git@github.com:pyscript/pyscript-cli.git
+  ```
+
+* Pull in the latest changes from the main `upstream` PyScript repository:
+
+    ```sh
+    git pull upstream main
+    ```
+
+* (Recommended) Upgrade local pip:
+
+    ```shell
+    pip install --upgrade pip
+    ```
+
+* Make a virtualenv and activate it:
+
+    ```shell
+    python -m venv .venv
+    source .venv/bin/activate
+    ```
+
+* Install your local enviroment dependencies
+
+    ```shell
+    pip install -e ".[dev]"
+    ```
 
 ## Use the CLI
 

From 5911391d59f7f81b49a98a7d262e48a1a754069b Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Mon, 20 May 2024 11:48:49 -0400
Subject: [PATCH 3/4] Added link to gitflow

---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2333105..502ea54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,6 +41,8 @@
     git pull upstream main
     ```
 
+    > Contribute changes using the [GitHub flow model](https://docs.github.com/en/get-started/using-github/github-flow) of coding collaboration.
+
 * (Recommended) Upgrade local pip:
 
     ```shell

From 1b8d331ff1cd1528575342561f228cabed45198f Mon Sep 17 00:00:00 2001
From: Nick Muoh <nickspirit3+github@gmail.com>
Date: Tue, 21 May 2024 17:41:11 -0400
Subject: [PATCH 4/4] Fixed whitespace

---
 tests/test_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_generator.py b/tests/test_generator.py
index c9c8c4a..fa9bbd4 100644
--- a/tests/test_generator.py
+++ b/tests/test_generator.py
@@ -237,7 +237,7 @@ def check_plugin_project_files(
         assert dedent(
             f"""        <div>
             <h2> Description </h2>
-            <p>{ plugin_description }</p>
+            <p>{plugin_description}</p>
         </div>"""
         )
         assert f'<py-script src="./{python_file}">' in contents