added some feedback fixes from mardown rewords to permission LeastPrivileg practices

Author: Chukslord1

.github/steps/1-create-a-pr.md

@@ -1,11 +1,3 @@
-<!--
-  <<< Author notes: Step 1 >>>
-  Choose 3-5 steps for your course.
-  The first step is always the hardest, so pick something easy!
-  Link to docs.github.com for further explanations.
-  Encourage users to open new tabs for steps!
--->
-
 ## Step 1: Create a pull request
 
 _Welcome to "Managing Merge Conflicts"! :wave:_

.github/steps/2-resolve-a-merge-conflict.md

@@ -1,9 +1,3 @@
-<!--
-  <<< Author notes: Step 2 >>>
-  Start this step by acknowledging the previous step.
-  Define terms and link to docs.github.com.
--->
-
 ## Step 2: Resolve a merge conflict
 
 _Good start! Now let's look deeper at a merge conflict! :mag:_

.github/steps/3-create-your-own-conflict.md

@@ -1,9 +1,3 @@
-<!--
-  <<< Author notes: Step 3 >>>
-  Start this step by acknowledging the previous step.
-  Define terms and link to docs.github.com.
--->
-
 ## Step 3: Create your own conflict
 
 _Good job! You've solved a merge conflict! :tada:_

.github/steps/4-merge-your-pull-request.md

@@ -1,9 +1,3 @@
-<!--
-  <<< Author notes: Step 4 >>>
-  Start this step by acknowledging the previous step.
-  Define terms and link to docs.github.com.
--->
-
 ## Step 4: Merge your pull request
 
 _Almost there! :heart:_

.github/steps/X-finish.md

@@ -1,11 +1,6 @@
-<!--
-  <<< Author notes: Finish >>>
-  Review what we learned, ask for feedback, provide next steps.
--->
-
 ## Finish
 
-_Congratulations friend, you've completed this course!_
+_Congratulations friend, you've completed this exercise!_
 
 <img src=https://octodex.github.com/images/benevocats.jpg alt=celebrate width=300 align=right>
 
@@ -17,8 +12,8 @@ Here's a recap of all the tasks you've accomplished in your repository:
 
 ### What's next?
 
-- Make your own Markdown resume site with GitHub Pages! Learn how in our [GitHub Pages](https://github.com/skills/github-pages) course.
-- We'd love to hear what you thought of this course [in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts).
-- [Take another GitHub Skills course](https://github.com/skills).
+- Make your own Markdown resume site with GitHub Pages! Learn how in our [GitHub Pages](https://github.com/skills/github-pages) exercise.
+- We'd love to hear what you thought of this exercise [in our discussion board](https://github.com/orgs/skills/discussions/categories/resolve-merge-conflicts).
+- [Take another GitHub Skills exercise](https://github.com/skills).
 - [Read the GitHub Getting Started docs](https://docs.github.com/en/get-started).
 - To find projects to contribute to, check out [GitHub Explore](https://github.com/explore).

.github/workflows/1-create-a-pr.yml

@@ -4,11 +4,8 @@ on:
   pull_request_target:
     branches: [main]
     types: [opened]
-  workflow_dispatch: {}
 
 permissions:
-  contents: write
-  actions: write
   issues: write
   pull-requests: write  # Required for commenting or updating PR
 
@@ -31,7 +28,7 @@ jobs:
       - name: Checkout the base branch (main)
         uses: actions/checkout@v4
         with:
-          ref: main  # Required because pull_request_target runs in the base branch context
+          ref: main  
 
       - name: Get response templates
         uses: actions/checkout@v4

README.md

@@ -1,24 +1,7 @@
-<header>
-
-<!--
-  <<< Author notes: Course header >>>
-  Include a 1280×640 image, course title in sentence case, and a concise description in emphasis.
-  In your repository settings: enable template repository, add your 1280×640 social image, auto delete head branches.
-  Add your open source license, GitHub uses MIT license.
--->
-
 # Resolve merge conflicts
 
 _Learn why conflicts happen and how to resolve them._
 
-</header>
-
-<!--
-  <<< Author notes: Course start >>>
-  Include start button, a note about Actions minutes,
-  and tell the learner why they should take the course.
--->
-
 ## Welcome
 
 Merge conflicts happen when two people make changes to the same file on GitHub—a common occurrence when you’re working with others. While resolving differences might involve some discussion, merge conflicts don’t have to be scary. This course guides you through the steps to finding the best merge conflict solution, so your team can keep building.
@@ -48,27 +31,17 @@ Simply copy the exercise to your account, then give your favorite Octocat (Mona)
 When copying the exercise, we recommend the following settings:
 
 - For owner, choose your personal account or an organization to host the repository.
-- We recommend creating a public repository, as private repositories will [use Actions minutes](https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions).
 
-If the exercise isn't ready in 20 seconds:
+- We recommend creating a public repository, since private repositories will use Actions minutes.
 
-1. After your new repository is created, wait about 20 seconds, then refresh the page.
-2. Follow the step-by-step instructions in the issue created in your repository.
-3. If the page doesn't refresh automatically, please check the [Actions](../../actions) tab.
-   - Check to see if a job is running. Sometimes it simply takes a bit longer.
-   - If the page shows a failed job, please submit an issue. Nice, you found a bug! 🐛
+If the exercise isn't ready in 20 seconds, please check the [Actions](../../actions) tab.
 
-</details>
+- Check to see if a job is running. Sometimes it simply takes a bit longer.
 
-<footer>
+- If the page shows a failed job, please submit an issue. Nice, you found a bug! 🐛
 
-<!--
-  <<< Author notes: Footer >>>
-  Add a link to get support, GitHub status page, code of conduct, license link.
--->
+</details>
 
 ---
 
 &copy; 2025 GitHub &bull; [Code of Conduct](https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md) &bull; [MIT License](https://gh.io/mit)
-
-</footer>