From 89151151b4ce962de6e15d906212d91091b375fc Mon Sep 17 00:00:00 2001 From: Shubh Rai Date: Sun, 17 Sep 2023 12:37:28 +0530 Subject: [PATCH 1/4] challenge 16 1 Signed-off-by: Shubh Rai --- challengers-list.md | 2 ++ contributors/shubhrai2811/shubhrai2811-2.md | 2 ++ contributors/shubhrai2811/shubhrai2811.md | 7 +++++++ gist-solution.md | 4 ++++ 4 files changed, 15 insertions(+) create mode 100644 contributors/shubhrai2811/shubhrai2811-2.md create mode 100644 contributors/shubhrai2811/shubhrai2811.md create mode 100644 gist-solution.md diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..edf068795 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +1,4 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) +2. [Shubh](https://github.com/shubhrai2811) + diff --git a/contributors/shubhrai2811/shubhrai2811-2.md b/contributors/shubhrai2811/shubhrai2811-2.md new file mode 100644 index 000000000..721139527 --- /dev/null +++ b/contributors/shubhrai2811/shubhrai2811-2.md @@ -0,0 +1,2 @@ +added newly tto check rebase +Shubh Rai diff --git a/contributors/shubhrai2811/shubhrai2811.md b/contributors/shubhrai2811/shubhrai2811.md new file mode 100644 index 000000000..a79d9ab7f --- /dev/null +++ b/contributors/shubhrai2811/shubhrai2811.md @@ -0,0 +1,7 @@ +--- +name: Shubh Rai +github_user_name: shubhrai2811 +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/45#issue-1876837890 +your_favorite_programming_language: C++ +made changes to this: to practice challenge 14 +--- diff --git a/gist-solution.md b/gist-solution.md new file mode 100644 index 000000000..1468e5feb --- /dev/null +++ b/gist-solution.md @@ -0,0 +1,4 @@ +gist 1 link - https://gist.github.com/shubhrai2811/24b4b51a74322d87328a74d0c8a69050 + + +gist 2 link -https://gist.github.com/shubhrai2811/bb1e93157a9018ca407fa2d71fb70674 From b20e54d02653971011896c3f91a39ae6bbce22b7 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 17 Sep 2023 10:45:30 +0530 Subject: [PATCH 2/4] chall 17 Signed-off-by: shivaylamba challenge 16 1 Signed-off-by: Shubh Rai --- .github/workflows/linter.yaml | 77 +++++++++++---------- Challenges/challenge17.md | 34 +++++++++ challengers-list.md | 2 + contributors/shubhrai2811/shubhrai2811-2.md | 2 + contributors/shubhrai2811/shubhrai2811.md | 7 ++ gist-solution.md | 4 ++ 6 files changed, 88 insertions(+), 38 deletions(-) create mode 100644 Challenges/challenge17.md create mode 100644 contributors/shubhrai2811/shubhrai2811-2.md create mode 100644 contributors/shubhrai2811/shubhrai2811.md create mode 100644 gist-solution.md diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 3ecf02389..b1dac57d2 100644 --- a/.github/workflows/linter.yaml +++ b/.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 }} \ No newline at end of file +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 }} \ No newline at end of file diff --git a/Challenges/challenge17.md b/Challenges/challenge17.md new file mode 100644 index 000000000..05b35b37f --- /dev/null +++ b/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: image + + +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 \ No newline at end of file diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..edf068795 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +1,4 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) +2. [Shubh](https://github.com/shubhrai2811) + diff --git a/contributors/shubhrai2811/shubhrai2811-2.md b/contributors/shubhrai2811/shubhrai2811-2.md new file mode 100644 index 000000000..721139527 --- /dev/null +++ b/contributors/shubhrai2811/shubhrai2811-2.md @@ -0,0 +1,2 @@ +added newly tto check rebase +Shubh Rai diff --git a/contributors/shubhrai2811/shubhrai2811.md b/contributors/shubhrai2811/shubhrai2811.md new file mode 100644 index 000000000..a79d9ab7f --- /dev/null +++ b/contributors/shubhrai2811/shubhrai2811.md @@ -0,0 +1,7 @@ +--- +name: Shubh Rai +github_user_name: shubhrai2811 +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/45#issue-1876837890 +your_favorite_programming_language: C++ +made changes to this: to practice challenge 14 +--- diff --git a/gist-solution.md b/gist-solution.md new file mode 100644 index 000000000..1468e5feb --- /dev/null +++ b/gist-solution.md @@ -0,0 +1,4 @@ +gist 1 link - https://gist.github.com/shubhrai2811/24b4b51a74322d87328a74d0c8a69050 + + +gist 2 link -https://gist.github.com/shubhrai2811/bb1e93157a9018ca407fa2d71fb70674 From 30e284429ced8857ee8b3c5bce5b6b19232c3f55 Mon Sep 17 00:00:00 2001 From: Shubh Rai Date: Sun, 17 Sep 2023 13:11:07 +0530 Subject: [PATCH 3/4] open pull req Signed-off-by: Shubh Rai --- challengers-list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challengers-list.md b/challengers-list.md index edf068795..258e64dca 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,4 +1,4 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) -2. [Shubh](https://github.com/shubhrai2811) +2. [Shubh Rai](https://github.com/shubhrai2811) From 078cc0e8183fa12b1738ab8f79e83dd568651720 Mon Sep 17 00:00:00 2001 From: Shubh Rai Date: Sat, 23 Sep 2023 12:27:32 +0530 Subject: [PATCH 4/4] added pages link Signed-off-by: Shubh Rai --- contributors/shubhrai2811/shubhrai2811.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/shubhrai2811/shubhrai2811.md b/contributors/shubhrai2811/shubhrai2811.md index a79d9ab7f..0fcc6ece0 100644 --- a/contributors/shubhrai2811/shubhrai2811.md +++ b/contributors/shubhrai2811/shubhrai2811.md @@ -3,5 +3,6 @@ name: Shubh Rai github_user_name: shubhrai2811 url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/45#issue-1876837890 your_favorite_programming_language: C++ -made changes to this: to practice challenge 14 +your_hosted_github_pages_link: https://shubhrai2811.github.io/ +your_hosted_github_pages_repository_link: https://github.com/shubhrai2811/shubhrai2811.github.io.git ---