Resolved Merge Conflict Challenge 17(List of Challengers)

.github/workflows/linter.yaml

@@ -1,38 +1,39 @@
-name: Lint Code Base
-
-on:
-  push:
-    branches-ignore: [master, main]
-    # Remove the line above to run when pushing to master
-  pull_request:
-    branches: [master, main]
-
-jobs:
-  build:
-    # Name the Job
-    name: Lint Code Base
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
-    steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v3
-        with:
-          # Full git history is needed to get a proper list of changed files within `super-linter`
-          fetch-depth: 0
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: github/super-linter@v4
-        env:
-          VALIDATE_ALL_CODEBASE: false
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+name: Lint Code Base 
+
+ on: 
+   push: 
+     branches-ignore: [master, main] 
+     # Remove the line above to run when pushing to master 
+   pull_request: 
+     branches: '*detail*'    # Run it on details branch only
+
+ jobs: 
+   build: 
+     # Name the Job 
+     name: Lint Code Base 
+     # Set the agent to run on 
+     runs-on: ubuntu-latest 
+
+     ################## 
+     # Load all steps # 
+     ################## 
+     steps: 
+       ########################## 
+       # Checkout the code base # 
+       ########################## 
+       - name: Checkout Code 
+         uses: actions/checkout@v3 
+         with: 
+           # Full git history is needed to get a proper list of changed files within `super-linter` 
+           fetch-depth: 0 
+
+       ################################ 
+       # Run Linter against code base # 
+       ################################ 
+       - name: Lint Code Base 
+         uses: github/super-linter@v4 
+         env: 
+           VALIDATE_ALL_CODEBASE: false 
+           DEFAULT_BRANCH: main 
+           FILTER_REGEX_EXCLUDE: .*Challenges/.*    # Ignore Challenges/ markdown files
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Challenges/challenge17.md

@@ -0,0 +1,34 @@
+## Welcome to Challenge 17
+
+Welcome to the 17th Challenge 
+
+
+NOTE:
+Before taking part.  Fill out the 2nd milestone Google Form (if haven't already) to officially submit your progress for Checkpoint 2 in the challenge: https://forms.gle/JnzBURSEjRejEgw4A
+
+
+In this 2 part challenge, we will try to emulate and fix merge conflicts via git. 
+
+Today is the second and final part of this challenge: 
+
+Task: 
+1. Navigate to your Pull Request (PR) created in previous challenges.You will notice that your PR has a conflict, indicated with a message similar to the one shown below: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
+
+
+2. Try to resolve this merge conflict using local git
+- Open the conflicted file(s) in your code editor. Git will mark the conflicting sections.
+
+- Manually edit the file to resolve the conflict by choosing which changes to keep.
+
+- Save the file.
+
+- Stage the resolved files by running `git add` after you have edited the files.
+
+- Commit the changes with a message that indicates you've resolved the conflict.
+
+- Push the changes to your remote repository.
+
+3. Once resolved, share screenshot on the github issue created in the previous challenges
+
+
+Note: for this challenge, you can follow this guide: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

challengers-list.md

@@ -1,3 +1,4 @@
 # List of challengers
 1. [Shivay](https://github.com/shivaylamba)
-2. [KishoreKumarP](https://github.com/4652KishoreKumar)
+2. [KishoreKumarP](https://github.com/4652KishoreKumar)
+2. [shivscaler](http://github.com/shivscaler)