From deff486eafa5e794b95ea701129dbb76aadc216d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20L=C3=BCscher?= <stephan.luescher@mykolab.com>
Date: Sat, 4 May 2024 05:57:03 +0000
Subject: [PATCH 1/3] chore(main): include bug and feature request github issue
 templates

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 31 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.yml | 17 ++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..deba488
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,31 @@
+name: Bug Report
+description: Report an issue about using forge
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out this bug report!
+  - type: textarea
+    id: describe-bug
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: Tell us what happened!
+      value: "When I entered 2 + 2, I got the answer 6."
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: What did you expect to happen?
+      description: A clear and concise description of what you expected to happen.
+      placeholder: What were you expecting to happen?
+      value: "I expected 2 + 2 to equal 4, but instead 2 + 2 equaled 6!"
+    validations:
+      required: true
+  - type: textarea
+    id: extra-context
+    attributes:
+      label: Extra information or context
+      description: Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..3f0b80a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,17 @@
+name: Feature Request
+description: Request a new feature to be included in the forge tool set
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out this feature request
+  - type: textarea
+    id: describe-feature
+    attributes:
+      label: Describe the feature
+      description: Include why you feel this should be in the forge
+      placeholder: Tell us what you need
+      value: "I'd like this project to be enhanced with ... because ..."
+    validations:
+      required: true

From 183d1c66fca962bba829356ab1e468535de0d59d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20L=C3=BCscher?= <stephan.luescher@mykolab.com>
Date: Sat, 4 May 2024 05:57:44 +0000
Subject: [PATCH 2/3] chore(devcontainer): vscode tasks for git cleanup

---
 .vscode/tasks.json | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index c2da266..079835e 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,20 +4,9 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Git: Fetch upstream",
-      "type": "shell",
-      "command": "git fetch upstream",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "Git: Merge from upstream",
-      "type": "shell",
-      "command": "git merge --no-ff --no-commit upstream/main",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
+      "label": "Git: Cleanup",
+      "dependsOn": ["Git: Delete merged branches", "Git: Prune remote"],
+      "problemMatcher": []
     },
     {
       "label": "Git: Delete merged branches",
@@ -35,5 +24,6 @@
         "cwd": "${workspaceFolder}"
       }
     }
-  ]
+  ],
+  "inputs": []
 }

From b873620efa0503826677c0b59716b05ad588a749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20L=C3=BCscher?= <stephan.luescher@mykolab.com>
Date: Sat, 4 May 2024 05:58:20 +0000
Subject: [PATCH 3/3] style(main): make example shorter

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

diff --git a/README.md b/README.md
index c23dee1..41104b5 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ just -f forge.just {{ recipe_name }} {{ forge_config_var_file }}
 **_Example:_**
 
 ```sh
-just -f forge.just forge_project-clone /var/home/stephan/ublue-os_forge/my-forge-project.env
+just -f forge.just forge_project-clone ~/ublue-os_forge/my-forge-project.env
 ```
 
 In case you don't have [just command runner](https://github.com/casey/just) available.