From adfd5c7938382fae3dbfa093cc58ec2cac04351f Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Tue, 5 Sep 2023 21:33:09 +0530 Subject: [PATCH 01/53] Task 5 Completed --- contributors/Veersen2001/Veersen2001.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/Veersen2001/Veersen2001.md diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md new file mode 100644 index 000000000..f97fac801 --- /dev/null +++ b/contributors/Veersen2001/Veersen2001.md @@ -0,0 +1,2 @@ +name: Veerbahadur Sen +github_user_name: Veersen2001 \ No newline at end of file From dc83865d86be81bbdbc1548445e1e2daa22a1060 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:22:36 +0530 Subject: [PATCH 02/53] Task 5 Completed --- contributors/Veersen2001/Veersen2001.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index f97fac801..2a88f096c 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,2 +1,3 @@ name: Veerbahadur Sen -github_user_name: Veersen2001 \ No newline at end of file +github_user_name: Veersen2001 +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From b5a197c8e4bddb5752267a62c70079e475c42dd5 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:55:39 +0530 Subject: [PATCH 03/53] Task 6 Completed --- contributors/Veersen2001/Veersen2001.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index 2a88f096c..92a2c0924 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,3 +1,5 @@ -name: Veerbahadur Sen -github_user_name: Veersen2001 -url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file +Name: Veerbahadur Sen + +github_user_name : Veersen2001 + +Url_of_github_issue : https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From 2f0876b7758eddb0db205018479f0201b67f8c1d Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 7 Sep 2023 11:41:38 +0530 Subject: [PATCH 04/53] challenge 7 add challenge 8 9 add 10th challenge Update challenge10.md Update challenge10.md update #2 11 Task 12 Completed Signed-off-by: shivaylamba challenge 13 add challenge 14 Update challenge14.md Create challenge15.md Update challenge15.md Update challenge15.md Update challenge15.md Create challenge16.md Create challengers-list.md chall 17 Signed-off-by: shivaylamba Update challengers-list.md add challenge 18 19 Signed-off-by: shivaylamba add chall 20 task Day 13 Completed --- .github/workflows/linter.yaml | 77 +++++------ Challenges/challenge10.md | 24 ++++ Challenges/challenge11.md | 11 ++ Challenges/challenge12.md | 22 +++ Challenges/challenge13.md | 26 ++++ Challenges/challenge14.md | 14 ++ Challenges/challenge15.md | 151 +++++++++++++++++++++ Challenges/challenge16.md | 31 +++++ Challenges/challenge17.md | 34 +++++ Challenges/challenge18.md | 19 +++ Challenges/challenge19.md | 46 +++++++ Challenges/challenge20.md | 69 ++++++++++ Challenges/challenge7.md | 23 ++++ Challenges/challenge8.md | 35 +++++ Challenges/challenge9.md | 19 +++ challengers-list.md | 3 + contributors/Veersen2001/gist-solutions.md | 2 + 17 files changed, 568 insertions(+), 38 deletions(-) create mode 100644 Challenges/challenge10.md create mode 100644 Challenges/challenge11.md create mode 100644 Challenges/challenge12.md create mode 100644 Challenges/challenge13.md create mode 100644 Challenges/challenge14.md create mode 100644 Challenges/challenge15.md create mode 100644 Challenges/challenge16.md create mode 100644 Challenges/challenge17.md create mode 100644 Challenges/challenge18.md create mode 100644 Challenges/challenge19.md create mode 100644 Challenges/challenge20.md create mode 100644 Challenges/challenge7.md create mode 100644 Challenges/challenge8.md create mode 100644 Challenges/challenge9.md create mode 100644 challengers-list.md create mode 100644 contributors/Veersen2001/gist-solutions.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/challenge10.md b/Challenges/challenge10.md new file mode 100644 index 000000000..6840ff7aa --- /dev/null +++ b/Challenges/challenge10.md @@ -0,0 +1,24 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. + + +Task: +1. Checkout to the branch you created in Challenge 3 in your forked repository. + +2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. + +4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. + +5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) + +7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + diff --git a/Challenges/challenge11.md b/Challenges/challenge11.md new file mode 100644 index 000000000..724b4a01c --- /dev/null +++ b/Challenges/challenge11.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 11 + +Welcome to the 11th Challenge + +Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning) + +Task: +1. Inside the branch you created in the previous challenge (challenge 3) ``your_github_username-details`` create a new file inside the directory ``contributors//`` directory. +2. Use the git stash command to move these changes to the stash area +3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge. + diff --git a/Challenges/challenge12.md b/Challenges/challenge12.md new file mode 100644 index 000000000..381f1804a --- /dev/null +++ b/Challenges/challenge12.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 12 + +Welcome to the 12th challenge! + +Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. + +A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. + +You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) + +Task: +1. Setup the ability to sign commits locally in your systems +2. Whenever committing in the future always try to use signed commits +3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``.md`` file: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +your_favroite_programming_language: Add your favorite programming language here +--- +``` \ No newline at end of file diff --git a/Challenges/challenge13.md b/Challenges/challenge13.md new file mode 100644 index 000000000..318f24414 --- /dev/null +++ b/Challenges/challenge13.md @@ -0,0 +1,26 @@ +## Welcome to Challenge 13th + +Welcome to the 13th Challenge + +Today we will be learning to work with GitHub Gists. + +Github Gists are a great way to share ideas and code snippets with others. + +#### Brief Overview + +GitHub Gist is two fold and you can either use it for sharing ideas or sharing smaple code. It supports **Markdown** +To learn more, vist: +- [Learn more about GitHub gist](https://help.github.com/en/enterprise/2.13/user/articles/about-gists) + +## Task + +- Create a gist writing on any software development related topic that interests you +- Create a gist sharing a small code snippet in your preferred programming language + +## How to Submit + +- Create your submission a markdown file named ``gist-solutions.md`` and add it inside the branch ``your_github_username-details`` used in previous challenges +- In your submission file add the links to your **2 gists** +- Ensure you push it so that it reflects inside your Pull request created in previous challenges + +Do remember to update your forum post on Discord with today's task completion and screenshot \ No newline at end of file diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md new file mode 100644 index 000000000..09af080d9 --- /dev/null +++ b/Challenges/challenge14.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 14 + +Welcome to the 14th Challenge + +Today's challenge is a re-practice of the 8th and 9th Challenge. + +So focus for this challenge will be to practice the ``git rebase`` command. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. +2. Once done, try to squash the commits in your pull request in the Challenge repository. +3. Also do sign your commits, covered in the Challenge 12. diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md new file mode 100644 index 000000000..650b5cbb0 --- /dev/null +++ b/Challenges/challenge15.md @@ -0,0 +1,151 @@ +## Welcome to Challenge 15 + +Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. + +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: + +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 15th challenge. + + +## Task: +Welcome to the 15th challenge! + +Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. + +Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: + +Task: +Create a Scenario for Merge Conflict: + +- Create a new project on your local system (e.g., a code project or a text file). + +- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. +Resolve the Merge Conflict: + +- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. + +- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. + +- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. + +- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. + + + + +### Sample Example for merge conflict +Here is an example of a merge conflict: + + +Step 1: Set Up Your Repository +a. Create a new directory on your computer for your Git project: + +``` +mkdir merge-conflict-example +cd merge-conflict-example +``` + +b. Initialize the directory as a Git repository: + +``` +git init +``` + +Step 2: Create Two Branches +a. Create a new branch called feature-branch: + + ``` + git checkout -b feature-branch + + ``` +b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: + +``` +This is some content on the feature branch. +``` + +c. Stage and commit your changes: + +``` +git add example.txt +git commit -m "Add feature branch content" + +``` +d. Switch back to the main (or master) branch: + +``` +git checkout main +``` +e. Make changes to the same file, example.txt, in the main branch. For example: + +``` +This is some content on the main branch. +``` + +f. Stage and commit your changes on the main branch: +``` +git add example.txt +git commit -m "Add main branch content" +``` + +Step 3: Create a Merge Conflict +a. Attempt to merge the feature-branch into main: + +``` +git merge feature-branch +``` + +At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. + + +Step 4: Resolve the Merge Conflict +a. Open the example.txt file in your code editor. + +b. You'll see Git's conflict markers, which look like this: + +``` +<<<<<<< HEAD +This is some content on the main branch. +======= +This is some content on the feature branch. +>>>>>>> feature-branch +``` + +c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: + +``` +This is some content on the main branch. + +This is some additional content on the feature branch. +``` + +d. Save the file. + + +Step 5: Commit the Resolved Merge Conflict +a. Stage the resolved file: + +``` +git add example.txt +``` + +b. Commit the changes: + +``` +git commit -m "Resolve merge conflict" +``` + +Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. + + + + + + diff --git a/Challenges/challenge16.md b/Challenges/challenge16.md new file mode 100644 index 000000000..6a96d3e9a --- /dev/null +++ b/Challenges/challenge16.md @@ -0,0 +1,31 @@ +## Welcome to Challenge 16 + +Welcome to the 16th Challenge + + +Before taking part. Fill out the Google Form 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 first part of this challenge: + +Task: +1. Sync Your Repository: + +- Update your Forked Repository From the Original [Main Repository](https://github.com/scaleracademy/scaler-open-source-september-challenge) locally. Also ensure that your branch ``your_github_username-details`` is also synced with the latest changes from the original repository. + +2. In your branch ``your_github_username-details`` open the ``challengers-list.md`` file. +Add your name to the list of challengers, following the format specified in the file. + + +3. Push your changes to reflect them in the Pull Request created in previous challenges. +Please note that by adding your name to the same file in a collaborative environment, this task may create a merge conflict when multiple participants attempt to push their changes simultaneously. Be prepared to resolve any conflicts that arise. + + +4. Add a new comment to the issue you created in the first task with the screenshot of the updated ``challengers-list.md`` file in your forked repository. + + + +Note: Next Challenge: Challenge 17 will focus on resolving merge conflicts. + 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/Challenges/challenge18.md b/Challenges/challenge18.md new file mode 100644 index 000000000..fddefe8b7 --- /dev/null +++ b/Challenges/challenge18.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 18 + +Welcome to the 18th Challenge + +Being a busy Monday, today's challenge is a bit straightforward. We will be learning how to work with GitHub Desktop + +#### Brief Overview + +GitHub Desktop is a GUI that empowers users who prefer not to work with the CLI to still interface with Git and GitHub. +To learn more visit: [What is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop) + + +## Tasks + +- Download GitHub desktop +- Create a new repository on GitHub +- Add anything you want to your repo +- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc) +- Share a screenshot of your experience using github desktop on the issue created in Challenge 1. \ No newline at end of file diff --git a/Challenges/challenge19.md b/Challenges/challenge19.md new file mode 100644 index 000000000..4a994e937 --- /dev/null +++ b/Challenges/challenge19.md @@ -0,0 +1,46 @@ +## Welcome to Challenge 19 + +Welcome to the 19th Challenge! + + +### Brief Overview +In this challenge, we will dive into the world of GitHub Codespaces, a powerful tool for development and collaboration. GitHub Codespaces allows you to code and build in an online environment, making it easier to collaborate on projects and work from anywhere. + +## Task: +1. Set Up a GitHub Codespace: + + - If you haven't already, create a GitHub repository or use an existing one that you'd like to work on. + +- Navigate to the repository's main page on GitHub. + +2. Create a Codespace: + + - Click on the "Code" button on the repository's main page. + - Select the option to "Open with Codespaces." + - Select the option to "New codespace." + - Wait for your Codespace to be created. + +3. Explore the Codespace: + +- Once your Codespace is ready, explore its features and capabilities. +- Familiarize yourself with the development environment, including code editing, terminal access, and integrated tools. +- If you're new to Codespaces, check out the [documentation](https://docs.github.com/en/github/developing-online-with-codespaces/creating-a-codespace) for more information. +- If you're already familiar with Codespaces, try out some of the features you haven't used before. + +4. Make a Change: + +- In your Codespace, make a simple code change to a file in your repository. +- Create a new branch, make a code edit, and commit the change. + +5. Push Your Changes: + +- Push the changes back to your GitHub repository from within your Codespace. +- Confirm that the changes are reflected in your GitHub repository. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with GitHub Codespaces. Mention any features you found useful, challenges you encountered, and how you envision using Codespaces in your development workflow. + + +By completing this challenge, you'll gain hands-on experience with GitHub Codespaces and discover its potential for enhancing your development workflow and collaboration with others. In fact a lot of you are also facing issues with your local Git, try solving the Open Source September Challenge with Codespaces. That is, try to create a Codespace for your forked repository and explore if that helps with any of the challenges where you are stuck. + diff --git a/Challenges/challenge20.md b/Challenges/challenge20.md new file mode 100644 index 000000000..977383dd1 --- /dev/null +++ b/Challenges/challenge20.md @@ -0,0 +1,69 @@ +## Welcome to Challenge 20 + + +Welcome to the 20th Challenge! + +Today's challenge is all about getting familiar with GitHub Actions and setting up a code linter workflow in your own repository. GitHub Actions allows you to automate various tasks, and one common use case is running code linting checks on your codebase. + +### Brief Overview +In this challenge, you'll set up a GitHub Actions workflow to run code linting checks on your codebase. You'll learn how to configure GitHub Actions to run whenever there are changes pushed to your repository. You'll also learn how to use a code linter to check your code for errors and ensure it adheres to the linting rules. + +Learn about GitHub Actions and code linting in the following resources: +1. [GitHub Actions](https://docs.github.com/en/actions) +2. [Code Linting](https://www.perforce.com/blog/qac/what-lint-code-and-what-linting-and-why-linting-important) +3. [Github Action Video on Code With Scaler Channel](https://www.youtube.com/watch?v=b_VypAwsvZI&ab_channel=CodewithScaler) +4. [How to setup Linter Github Actions for your repository](https://www.freecodecamp.org/news/github-super-linter/) + + +## Task: Set Up a GitHub Action for Code Linting +1. Create a New Repository on Github. + +2. Set Up a GitHub Action for Code Linting: + +- In your repository, navigate to the "Actions" tab. +- Select the option to "Set up a workflow yourself." +- Create a new GitHub Action workflow file. You can name it lint.yml instead of main.yml. +- Add the following code to the workflow file: +``` +name: Lint Code Base + +on: [push, pull_request] + +jobs: + build: + name: Lint Code Base + runs-on: ubuntu-latest + + steps: + + - name: Checkout Code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Lint Code Base + uses: github/super-linter@v4 +``` +- Commit the lint.yml workflow file to your repository and push the changes. + + +3. Add a Sample Code File: + +- Inside your repository, create a new file (e.g., hello.py for Python or hello.js for JavaScript). +Write a simple code snippet in your preferred programming language. It could be a "Hello, World!" program or any code you like. + +4. Check the GitHub Actions Workflow: + +- Visit the "Actions" tab in your repository to see your newly created workflow in action. +- Observe how GitHub Actions automatically runs the code linting checks whenever there are new commits or pull requests. + +5. Ensure the Workflow Passes: + +- Make sure your code file adheres to the linting rules. If there are linting errors, fix them in your code file. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with setting up GitHub Actions for code linting by sharing a screenshot of your repoistory and the workflow running. + + +By completing this challenge, you'll have hands-on experience setting up GitHub Actions for code linting, which can significantly improve your code quality and streamline your development process. \ No newline at end of file diff --git a/Challenges/challenge7.md b/Challenges/challenge7.md new file mode 100644 index 000000000..f523e0d13 --- /dev/null +++ b/Challenges/challenge7.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 7 + +Welcome to the 7th challenge! Today we will learn about the concept of Git Reset. + +Today's the task focus is to create an additional commit in your branch. And then remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. + +This can be done by using the following command: ``git reset`` + +Here is an article you can refer to for understanding how git reset works: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset#:~:text=a%20shared%20repository.-,Summary,Index%2C%20and%20the%20Working%20Directory. + +So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. + + +Task: +1. Inside the branch you created during the prior challenges in your local forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markdown file and push the change to your forked repository. + +2. Ensure the change appears in the Pull request created in previous challenges + +3. Identify the commit id for the commit you just made and use the git reset command to remove the commit from your local branch. Note: Use git reset and force push, to remove the commit from your pull request. + +4. Share a screenshot of this, in the issue you created in previous challenges. + +5. Update your Discord forum post you created with the Challenge 7. diff --git a/Challenges/challenge8.md b/Challenges/challenge8.md new file mode 100644 index 000000000..ab4478feb --- /dev/null +++ b/Challenges/challenge8.md @@ -0,0 +1,35 @@ +## Welcome to Challenge 8 + +Congratulations on successfully completing the 7th challenge! This marks the completion of the first milestone of the challenge. + +Before you proceed with the 8th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [First Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/19529592/266515279-9696f91e-138d-44b0-b42b-08c5e679f4ac.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/n6VL2xCSeP6vgtgL6) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 8th challenge. + + +## Task: +Welcome to the eighth challenge! + +This is a two part challenge to cover the concepts of Git Rebase and Git Squash. + +Resources to refer to: +1. [Git Rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) +2. [Git Squash](https://www.freecodecamp.org/news/git-squash-explained/) +3. [Git Merge](https://www.atlassian.com/git/tutorials/using-branches/git-merge) + +Step 1: Ensure you have covered all the previous challenges properly and have completed the tasks in the previous challenges. + +Step 2: Today's goal is to understand the concept of Git Rebase and Git Squash. Go through these resources to understand the concept of Git Rebase and Git Squash as this will be used in the subsequent tasks. + +Step 3: Create a new branch in your forked repository by the name of ``challenge8`` and switch to that branch. + +Step 4: Add a new file by the name of ``your-github-username-3.md`` and add any details you may want to add to this markdown file and push the change to your forked repository. + +That's it for the first part of the challenge. diff --git a/Challenges/challenge9.md b/Challenges/challenge9.md new file mode 100644 index 000000000..b45c61f32 --- /dev/null +++ b/Challenges/challenge9.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 9 + +This challenge is a two part challenge to cover the concepts of Git Rebase and Git Squash and continuation of the previous challenge which is challenge 8. + + + +Task: + +1. First, make sure you are on the ``challenge8`` branch as created in the previous challenge. + +2. Create another commit by making some change in the ``your-github-username-3.md`` file and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. +For this. Review the commits you've made on the challenge8 branch using the git log --oneline command. You should see two commits on the challenge8 branch. Use the interactive rebase command to squash the commits. + +4. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +5. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + diff --git a/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..848dec155 --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,3 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) +2. [shivscaler](http://github.com/shivscaler) diff --git a/contributors/Veersen2001/gist-solutions.md b/contributors/Veersen2001/gist-solutions.md new file mode 100644 index 000000000..33e38428c --- /dev/null +++ b/contributors/Veersen2001/gist-solutions.md @@ -0,0 +1,2 @@ +**1 gists** : https://gist.github.com/Veersen2001/9dab53a4bcf4c12dbefb03a0c0c25f0f +**2 gists**: https://gist.github.com/Veersen2001/00a6b7cb2a7f5a7646bbba3f85d255b9 \ No newline at end of file From d08263e8b4b134b55c1e34d57eeba727a5ccfc37 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Tue, 5 Sep 2023 13:30:02 +0530 Subject: [PATCH 05/53] Update challenge5.md Signed-off-by: veersen2001 --- Challenges/challenge5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge5.md b/Challenges/challenge5.md index 7fc392c0c..ee827842a 100644 --- a/Challenges/challenge5.md +++ b/Challenges/challenge5.md @@ -41,7 +41,7 @@ name: your_name github_user_name: YOUR-GITHUB-USERNAME --- ``` -6. Submit your Pull Request on the main challenge repository. +6. Submit your Pull Request on the main challenge repository: i.e. https://github.com/scaleracademy/scaler-open-source-september-challenge . From 1b6718ca17d1e64492f9dd5c2e65ab2e149f1802 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Tue, 5 Sep 2023 21:33:09 +0530 Subject: [PATCH 06/53] Task 5 Completed Signed-off-by: veersen2001 --- contributors/Veersen2001/Veersen2001.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contributors/Veersen2001/Veersen2001.md diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md new file mode 100644 index 000000000..f97fac801 --- /dev/null +++ b/contributors/Veersen2001/Veersen2001.md @@ -0,0 +1,2 @@ +name: Veerbahadur Sen +github_user_name: Veersen2001 \ No newline at end of file From ac0df2eee49b8ae8525d5f0fb4384ed63733afd9 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Wed, 6 Sep 2023 11:18:01 +0530 Subject: [PATCH 07/53] challenge 6 Signed-off-by: veersen2001 --- Challenges/challenge6.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Challenges/challenge6.md diff --git a/Challenges/challenge6.md b/Challenges/challenge6.md new file mode 100644 index 000000000..5573cc073 --- /dev/null +++ b/Challenges/challenge6.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 6 + +Welcome to the sixth challenge! + +Today's goal is to update your pull request that you created in [Challenge 5](https://github.com/scaleracademy/scaler-open-source-september-challenge/blob/main/Challenges/challenge5.md) + +Task +1. Create a new commit in the branch you created in Challenge 2 in your forked repository +2. The change that you have to make should be the following: +In the markdown file that was created in Challenge 5, edit the details as follows: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +--- +``` +Note: The url_of_github_issue should be the link of the github issue that you created in Challenge 1. + +3. After making this change create a commit with a proper commit message and push the changes to your forked repository +4. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) From 58aed218ef89342bd8e83cd097563c95d8214ac6 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:22:36 +0530 Subject: [PATCH 08/53] Task 5 Completed Signed-off-by: veersen2001 --- contributors/Veersen2001/Veersen2001.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index f97fac801..2a88f096c 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,2 +1,3 @@ name: Veerbahadur Sen -github_user_name: Veersen2001 \ No newline at end of file +github_user_name: Veersen2001 +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From 3f3630707e9e9d94896a1acc5d4c120de96a1316 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:55:39 +0530 Subject: [PATCH 09/53] Task 6 Completed Signed-off-by: veersen2001 --- contributors/Veersen2001/Veersen2001.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index 2a88f096c..92a2c0924 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,3 +1,5 @@ -name: Veerbahadur Sen -github_user_name: Veersen2001 -url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file +Name: Veerbahadur Sen + +github_user_name : Veersen2001 + +Url_of_github_issue : https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From f9750c280f837fe8473c4b40fb84f9ce6e5afa64 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 7 Sep 2023 11:41:38 +0530 Subject: [PATCH 10/53] challenge 7 add challenge 8 9 add 10th challenge Update challenge10.md Update challenge10.md update #2 11 Task 12 Completed Signed-off-by: shivaylamba challenge 13 add challenge 14 Update challenge14.md Create challenge15.md Update challenge15.md Update challenge15.md Update challenge15.md Create challenge16.md Create challengers-list.md chall 17 Signed-off-by: shivaylamba Update challengers-list.md add challenge 18 19 Signed-off-by: shivaylamba add chall 20 task Day 13 Completed Signed-off-by: veersen2001 --- .github/workflows/linter.yaml | 77 +++++------ Challenges/challenge10.md | 24 ++++ Challenges/challenge11.md | 11 ++ Challenges/challenge12.md | 22 +++ Challenges/challenge13.md | 26 ++++ Challenges/challenge14.md | 14 ++ Challenges/challenge15.md | 151 +++++++++++++++++++++ Challenges/challenge16.md | 31 +++++ Challenges/challenge17.md | 34 +++++ Challenges/challenge18.md | 19 +++ Challenges/challenge19.md | 46 +++++++ Challenges/challenge20.md | 69 ++++++++++ Challenges/challenge7.md | 23 ++++ Challenges/challenge8.md | 35 +++++ Challenges/challenge9.md | 19 +++ challengers-list.md | 3 + contributors/Veersen2001/gist-solutions.md | 2 + 17 files changed, 568 insertions(+), 38 deletions(-) create mode 100644 Challenges/challenge10.md create mode 100644 Challenges/challenge11.md create mode 100644 Challenges/challenge12.md create mode 100644 Challenges/challenge13.md create mode 100644 Challenges/challenge14.md create mode 100644 Challenges/challenge15.md create mode 100644 Challenges/challenge16.md create mode 100644 Challenges/challenge17.md create mode 100644 Challenges/challenge18.md create mode 100644 Challenges/challenge19.md create mode 100644 Challenges/challenge20.md create mode 100644 Challenges/challenge7.md create mode 100644 Challenges/challenge8.md create mode 100644 Challenges/challenge9.md create mode 100644 challengers-list.md create mode 100644 contributors/Veersen2001/gist-solutions.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/challenge10.md b/Challenges/challenge10.md new file mode 100644 index 000000000..6840ff7aa --- /dev/null +++ b/Challenges/challenge10.md @@ -0,0 +1,24 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. + + +Task: +1. Checkout to the branch you created in Challenge 3 in your forked repository. + +2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. + +4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. + +5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) + +7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + diff --git a/Challenges/challenge11.md b/Challenges/challenge11.md new file mode 100644 index 000000000..724b4a01c --- /dev/null +++ b/Challenges/challenge11.md @@ -0,0 +1,11 @@ +## Welcome to Challenge 11 + +Welcome to the 11th Challenge + +Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning) + +Task: +1. Inside the branch you created in the previous challenge (challenge 3) ``your_github_username-details`` create a new file inside the directory ``contributors//`` directory. +2. Use the git stash command to move these changes to the stash area +3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge. + diff --git a/Challenges/challenge12.md b/Challenges/challenge12.md new file mode 100644 index 000000000..381f1804a --- /dev/null +++ b/Challenges/challenge12.md @@ -0,0 +1,22 @@ +## Welcome to Challenge 12 + +Welcome to the 12th challenge! + +Today's challenge is based on the concept of signing your commits. Signing the commits is a way of showing that only authentic commits are being made. + +A lot of open source projects have DCO which stands for [Developer Certification of Origin](https://github.com/apps/dco) including this repository itself and it tries to verify that each commit is signed or not. In case your commit is not signed it will reflect in the pull request that it doesn't pass the DCO test. + +You can read more about how to sign commits [here](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) + +Task: +1. Setup the ability to sign commits locally in your systems +2. Whenever committing in the future always try to use signed commits +3. Make a new signed commit to the pull request that you have made in previous challenges by making this change to the ``.md`` file: +``` +--- +name: your_name +github_user_name: YOUR-GITHUB-USERNAME +url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge +your_favroite_programming_language: Add your favorite programming language here +--- +``` \ No newline at end of file diff --git a/Challenges/challenge13.md b/Challenges/challenge13.md new file mode 100644 index 000000000..318f24414 --- /dev/null +++ b/Challenges/challenge13.md @@ -0,0 +1,26 @@ +## Welcome to Challenge 13th + +Welcome to the 13th Challenge + +Today we will be learning to work with GitHub Gists. + +Github Gists are a great way to share ideas and code snippets with others. + +#### Brief Overview + +GitHub Gist is two fold and you can either use it for sharing ideas or sharing smaple code. It supports **Markdown** +To learn more, vist: +- [Learn more about GitHub gist](https://help.github.com/en/enterprise/2.13/user/articles/about-gists) + +## Task + +- Create a gist writing on any software development related topic that interests you +- Create a gist sharing a small code snippet in your preferred programming language + +## How to Submit + +- Create your submission a markdown file named ``gist-solutions.md`` and add it inside the branch ``your_github_username-details`` used in previous challenges +- In your submission file add the links to your **2 gists** +- Ensure you push it so that it reflects inside your Pull request created in previous challenges + +Do remember to update your forum post on Discord with today's task completion and screenshot \ No newline at end of file diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md new file mode 100644 index 000000000..09af080d9 --- /dev/null +++ b/Challenges/challenge14.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 14 + +Welcome to the 14th Challenge + +Today's challenge is a re-practice of the 8th and 9th Challenge. + +So focus for this challenge will be to practice the ``git rebase`` command. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. +2. Once done, try to squash the commits in your pull request in the Challenge repository. +3. Also do sign your commits, covered in the Challenge 12. diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md new file mode 100644 index 000000000..650b5cbb0 --- /dev/null +++ b/Challenges/challenge15.md @@ -0,0 +1,151 @@ +## Welcome to Challenge 15 + +Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. + +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: + +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 15th challenge. + + +## Task: +Welcome to the 15th challenge! + +Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. + +Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: + +Task: +Create a Scenario for Merge Conflict: + +- Create a new project on your local system (e.g., a code project or a text file). + +- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. +Resolve the Merge Conflict: + +- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. + +- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. + +- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. + +- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. + + + + +### Sample Example for merge conflict +Here is an example of a merge conflict: + + +Step 1: Set Up Your Repository +a. Create a new directory on your computer for your Git project: + +``` +mkdir merge-conflict-example +cd merge-conflict-example +``` + +b. Initialize the directory as a Git repository: + +``` +git init +``` + +Step 2: Create Two Branches +a. Create a new branch called feature-branch: + + ``` + git checkout -b feature-branch + + ``` +b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: + +``` +This is some content on the feature branch. +``` + +c. Stage and commit your changes: + +``` +git add example.txt +git commit -m "Add feature branch content" + +``` +d. Switch back to the main (or master) branch: + +``` +git checkout main +``` +e. Make changes to the same file, example.txt, in the main branch. For example: + +``` +This is some content on the main branch. +``` + +f. Stage and commit your changes on the main branch: +``` +git add example.txt +git commit -m "Add main branch content" +``` + +Step 3: Create a Merge Conflict +a. Attempt to merge the feature-branch into main: + +``` +git merge feature-branch +``` + +At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. + + +Step 4: Resolve the Merge Conflict +a. Open the example.txt file in your code editor. + +b. You'll see Git's conflict markers, which look like this: + +``` +<<<<<<< HEAD +This is some content on the main branch. +======= +This is some content on the feature branch. +>>>>>>> feature-branch +``` + +c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: + +``` +This is some content on the main branch. + +This is some additional content on the feature branch. +``` + +d. Save the file. + + +Step 5: Commit the Resolved Merge Conflict +a. Stage the resolved file: + +``` +git add example.txt +``` + +b. Commit the changes: + +``` +git commit -m "Resolve merge conflict" +``` + +Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. + + + + + + diff --git a/Challenges/challenge16.md b/Challenges/challenge16.md new file mode 100644 index 000000000..6a96d3e9a --- /dev/null +++ b/Challenges/challenge16.md @@ -0,0 +1,31 @@ +## Welcome to Challenge 16 + +Welcome to the 16th Challenge + + +Before taking part. Fill out the Google Form 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 first part of this challenge: + +Task: +1. Sync Your Repository: + +- Update your Forked Repository From the Original [Main Repository](https://github.com/scaleracademy/scaler-open-source-september-challenge) locally. Also ensure that your branch ``your_github_username-details`` is also synced with the latest changes from the original repository. + +2. In your branch ``your_github_username-details`` open the ``challengers-list.md`` file. +Add your name to the list of challengers, following the format specified in the file. + + +3. Push your changes to reflect them in the Pull Request created in previous challenges. +Please note that by adding your name to the same file in a collaborative environment, this task may create a merge conflict when multiple participants attempt to push their changes simultaneously. Be prepared to resolve any conflicts that arise. + + +4. Add a new comment to the issue you created in the first task with the screenshot of the updated ``challengers-list.md`` file in your forked repository. + + + +Note: Next Challenge: Challenge 17 will focus on resolving merge conflicts. + 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/Challenges/challenge18.md b/Challenges/challenge18.md new file mode 100644 index 000000000..fddefe8b7 --- /dev/null +++ b/Challenges/challenge18.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 18 + +Welcome to the 18th Challenge + +Being a busy Monday, today's challenge is a bit straightforward. We will be learning how to work with GitHub Desktop + +#### Brief Overview + +GitHub Desktop is a GUI that empowers users who prefer not to work with the CLI to still interface with Git and GitHub. +To learn more visit: [What is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop) + + +## Tasks + +- Download GitHub desktop +- Create a new repository on GitHub +- Add anything you want to your repo +- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc) +- Share a screenshot of your experience using github desktop on the issue created in Challenge 1. \ No newline at end of file diff --git a/Challenges/challenge19.md b/Challenges/challenge19.md new file mode 100644 index 000000000..4a994e937 --- /dev/null +++ b/Challenges/challenge19.md @@ -0,0 +1,46 @@ +## Welcome to Challenge 19 + +Welcome to the 19th Challenge! + + +### Brief Overview +In this challenge, we will dive into the world of GitHub Codespaces, a powerful tool for development and collaboration. GitHub Codespaces allows you to code and build in an online environment, making it easier to collaborate on projects and work from anywhere. + +## Task: +1. Set Up a GitHub Codespace: + + - If you haven't already, create a GitHub repository or use an existing one that you'd like to work on. + +- Navigate to the repository's main page on GitHub. + +2. Create a Codespace: + + - Click on the "Code" button on the repository's main page. + - Select the option to "Open with Codespaces." + - Select the option to "New codespace." + - Wait for your Codespace to be created. + +3. Explore the Codespace: + +- Once your Codespace is ready, explore its features and capabilities. +- Familiarize yourself with the development environment, including code editing, terminal access, and integrated tools. +- If you're new to Codespaces, check out the [documentation](https://docs.github.com/en/github/developing-online-with-codespaces/creating-a-codespace) for more information. +- If you're already familiar with Codespaces, try out some of the features you haven't used before. + +4. Make a Change: + +- In your Codespace, make a simple code change to a file in your repository. +- Create a new branch, make a code edit, and commit the change. + +5. Push Your Changes: + +- Push the changes back to your GitHub repository from within your Codespace. +- Confirm that the changes are reflected in your GitHub repository. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with GitHub Codespaces. Mention any features you found useful, challenges you encountered, and how you envision using Codespaces in your development workflow. + + +By completing this challenge, you'll gain hands-on experience with GitHub Codespaces and discover its potential for enhancing your development workflow and collaboration with others. In fact a lot of you are also facing issues with your local Git, try solving the Open Source September Challenge with Codespaces. That is, try to create a Codespace for your forked repository and explore if that helps with any of the challenges where you are stuck. + diff --git a/Challenges/challenge20.md b/Challenges/challenge20.md new file mode 100644 index 000000000..977383dd1 --- /dev/null +++ b/Challenges/challenge20.md @@ -0,0 +1,69 @@ +## Welcome to Challenge 20 + + +Welcome to the 20th Challenge! + +Today's challenge is all about getting familiar with GitHub Actions and setting up a code linter workflow in your own repository. GitHub Actions allows you to automate various tasks, and one common use case is running code linting checks on your codebase. + +### Brief Overview +In this challenge, you'll set up a GitHub Actions workflow to run code linting checks on your codebase. You'll learn how to configure GitHub Actions to run whenever there are changes pushed to your repository. You'll also learn how to use a code linter to check your code for errors and ensure it adheres to the linting rules. + +Learn about GitHub Actions and code linting in the following resources: +1. [GitHub Actions](https://docs.github.com/en/actions) +2. [Code Linting](https://www.perforce.com/blog/qac/what-lint-code-and-what-linting-and-why-linting-important) +3. [Github Action Video on Code With Scaler Channel](https://www.youtube.com/watch?v=b_VypAwsvZI&ab_channel=CodewithScaler) +4. [How to setup Linter Github Actions for your repository](https://www.freecodecamp.org/news/github-super-linter/) + + +## Task: Set Up a GitHub Action for Code Linting +1. Create a New Repository on Github. + +2. Set Up a GitHub Action for Code Linting: + +- In your repository, navigate to the "Actions" tab. +- Select the option to "Set up a workflow yourself." +- Create a new GitHub Action workflow file. You can name it lint.yml instead of main.yml. +- Add the following code to the workflow file: +``` +name: Lint Code Base + +on: [push, pull_request] + +jobs: + build: + name: Lint Code Base + runs-on: ubuntu-latest + + steps: + + - name: Checkout Code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Lint Code Base + uses: github/super-linter@v4 +``` +- Commit the lint.yml workflow file to your repository and push the changes. + + +3. Add a Sample Code File: + +- Inside your repository, create a new file (e.g., hello.py for Python or hello.js for JavaScript). +Write a simple code snippet in your preferred programming language. It could be a "Hello, World!" program or any code you like. + +4. Check the GitHub Actions Workflow: + +- Visit the "Actions" tab in your repository to see your newly created workflow in action. +- Observe how GitHub Actions automatically runs the code linting checks whenever there are new commits or pull requests. + +5. Ensure the Workflow Passes: + +- Make sure your code file adheres to the linting rules. If there are linting errors, fix them in your code file. + +6. Share Your Experience: + +- In the GitHub issue created in Challenge 1, share your experience with setting up GitHub Actions for code linting by sharing a screenshot of your repoistory and the workflow running. + + +By completing this challenge, you'll have hands-on experience setting up GitHub Actions for code linting, which can significantly improve your code quality and streamline your development process. \ No newline at end of file diff --git a/Challenges/challenge7.md b/Challenges/challenge7.md new file mode 100644 index 000000000..f523e0d13 --- /dev/null +++ b/Challenges/challenge7.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 7 + +Welcome to the 7th challenge! Today we will learn about the concept of Git Reset. + +Today's the task focus is to create an additional commit in your branch. And then remove that commit that has been pushed from the pull request created in previous challenges. The main purpose of this is because there can be times when you might push an unncessary or wrong commit and you way want to remove it from your pull request. + +This can be done by using the following command: ``git reset`` + +Here is an article you can refer to for understanding how git reset works: https://www.atlassian.com/git/tutorials/undoing-changes/git-reset#:~:text=a%20shared%20repository.-,Summary,Index%2C%20and%20the%20Working%20Directory. + +So the task is to identity the commit id of the commit you want to remove, use the git reset command, and remove the commit from the pull request by force pushing into it. + + +Task: +1. Inside the branch you created during the prior challenges in your local forked repository, make a new file by the name of ``your-github-username-2.md`` and add any details you may want to add to this markdown file and push the change to your forked repository. + +2. Ensure the change appears in the Pull request created in previous challenges + +3. Identify the commit id for the commit you just made and use the git reset command to remove the commit from your local branch. Note: Use git reset and force push, to remove the commit from your pull request. + +4. Share a screenshot of this, in the issue you created in previous challenges. + +5. Update your Discord forum post you created with the Challenge 7. diff --git a/Challenges/challenge8.md b/Challenges/challenge8.md new file mode 100644 index 000000000..ab4478feb --- /dev/null +++ b/Challenges/challenge8.md @@ -0,0 +1,35 @@ +## Welcome to Challenge 8 + +Congratulations on successfully completing the 7th challenge! This marks the completion of the first milestone of the challenge. + +Before you proceed with the 8th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [First Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/19529592/266515279-9696f91e-138d-44b0-b42b-08c5e679f4ac.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/n6VL2xCSeP6vgtgL6) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 8th challenge. + + +## Task: +Welcome to the eighth challenge! + +This is a two part challenge to cover the concepts of Git Rebase and Git Squash. + +Resources to refer to: +1. [Git Rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) +2. [Git Squash](https://www.freecodecamp.org/news/git-squash-explained/) +3. [Git Merge](https://www.atlassian.com/git/tutorials/using-branches/git-merge) + +Step 1: Ensure you have covered all the previous challenges properly and have completed the tasks in the previous challenges. + +Step 2: Today's goal is to understand the concept of Git Rebase and Git Squash. Go through these resources to understand the concept of Git Rebase and Git Squash as this will be used in the subsequent tasks. + +Step 3: Create a new branch in your forked repository by the name of ``challenge8`` and switch to that branch. + +Step 4: Add a new file by the name of ``your-github-username-3.md`` and add any details you may want to add to this markdown file and push the change to your forked repository. + +That's it for the first part of the challenge. diff --git a/Challenges/challenge9.md b/Challenges/challenge9.md new file mode 100644 index 000000000..b45c61f32 --- /dev/null +++ b/Challenges/challenge9.md @@ -0,0 +1,19 @@ +## Welcome to Challenge 9 + +This challenge is a two part challenge to cover the concepts of Git Rebase and Git Squash and continuation of the previous challenge which is challenge 8. + + + +Task: + +1. First, make sure you are on the ``challenge8`` branch as created in the previous challenge. + +2. Create another commit by making some change in the ``your-github-username-3.md`` file and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. +For this. Review the commits you've made on the challenge8 branch using the git log --oneline command. You should see two commits on the challenge8 branch. Use the interactive rebase command to squash the commits. + +4. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +5. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + diff --git a/challengers-list.md b/challengers-list.md new file mode 100644 index 000000000..848dec155 --- /dev/null +++ b/challengers-list.md @@ -0,0 +1,3 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) +2. [shivscaler](http://github.com/shivscaler) diff --git a/contributors/Veersen2001/gist-solutions.md b/contributors/Veersen2001/gist-solutions.md new file mode 100644 index 000000000..33e38428c --- /dev/null +++ b/contributors/Veersen2001/gist-solutions.md @@ -0,0 +1,2 @@ +**1 gists** : https://gist.github.com/Veersen2001/9dab53a4bcf4c12dbefb03a0c0c25f0f +**2 gists**: https://gist.github.com/Veersen2001/00a6b7cb2a7f5a7646bbba3f85d255b9 \ No newline at end of file From 3a4a85da4f48881d22083d19e18c4ccf3274a33f Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 15:15:20 +0530 Subject: [PATCH 11/53] add 10th challenge --- Challenges/challenge10.md | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 6840ff7aa..e69de29bb 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -1,24 +0,0 @@ -## Welcome to Challenge 10 - -Welcome to the 10th challenge! - -Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. - - -Task: -1. Checkout to the branch you created in Challenge 3 in your forked repository. - -2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. - -3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. - -4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. - -5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. - -6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. - -( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) - -7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). - From 12dd2ff6b237ca699d98d3a6a59b557c49d3f78a Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:32:08 +0530 Subject: [PATCH 12/53] Update challenge10.md --- Challenges/challenge10.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index e69de29bb..1d57c74b4 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -0,0 +1,24 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. + + +Task: +1. Checkout to the branch you created in Challenge 2 in your forked repository. + +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. + +4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. + +5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) + +7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + From e5bb5e12e88e28926627327669f81e7e90f8fd76 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:33:06 +0530 Subject: [PATCH 13/53] Update challenge10.md Signed-off-by: veersen2001 --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 1d57c74b4..b3c614a09 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 2 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From 97f6eb45fc9df94116efd0b8b9515435b35f5b41 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 16:55:47 +0530 Subject: [PATCH 14/53] update #2 Signed-off-by: veersen2001 --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index b3c614a09..dfa8553b5 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 2 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From 0cbcb6b8262538d9c4fec6e1c60b38a7981f9878 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 14 Sep 2023 11:19:30 +0530 Subject: [PATCH 15/53] add challenge 14 --- Challenges/challenge14.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index 09af080d9..e69de29bb 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -1,14 +0,0 @@ -## Welcome to Challenge 14 - -Welcome to the 14th Challenge - -Today's challenge is a re-practice of the 8th and 9th Challenge. - -So focus for this challenge will be to practice the ``git rebase`` command. - -Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ - -Task: -1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. -2. Once done, try to squash the commits in your pull request in the Challenge repository. -3. Also do sign your commits, covered in the Challenge 12. From 4aa7872a658c0aafd7e16fb90d69f6d63b9c2ce0 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 14 Sep 2023 11:20:25 +0530 Subject: [PATCH 16/53] Update challenge14.md --- Challenges/challenge14.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index e69de29bb..7802e4986 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 12 + +Welcome to the 12th Challenge + +Today's challenge is a re-practice of the 8th and 9th Challenge. + +So focus for this challenge will be to practice the ``git rebase`` command. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. +2. Once done, try to squash the commits in your pull request in the Challenge repository. +3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file From 5456858649842b822794f97b5d955c0a0595a4a0 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:46:49 +0530 Subject: [PATCH 17/53] Create challenge15.md --- Challenges/challenge15.md | 151 -------------------------------------- 1 file changed, 151 deletions(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 650b5cbb0..e69de29bb 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -1,151 +0,0 @@ -## Welcome to Challenge 15 - -Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. - -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: - -## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): - -1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. - -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. - - -Once you have completed the above, you can proceed with the 15th challenge. - - -## Task: -Welcome to the 15th challenge! - -Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. - -Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: - -Task: -Create a Scenario for Merge Conflict: - -- Create a new project on your local system (e.g., a code project or a text file). - -- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. -Resolve the Merge Conflict: - -- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. - -- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. - -- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. - -- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. - - - - -### Sample Example for merge conflict -Here is an example of a merge conflict: - - -Step 1: Set Up Your Repository -a. Create a new directory on your computer for your Git project: - -``` -mkdir merge-conflict-example -cd merge-conflict-example -``` - -b. Initialize the directory as a Git repository: - -``` -git init -``` - -Step 2: Create Two Branches -a. Create a new branch called feature-branch: - - ``` - git checkout -b feature-branch - - ``` -b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: - -``` -This is some content on the feature branch. -``` - -c. Stage and commit your changes: - -``` -git add example.txt -git commit -m "Add feature branch content" - -``` -d. Switch back to the main (or master) branch: - -``` -git checkout main -``` -e. Make changes to the same file, example.txt, in the main branch. For example: - -``` -This is some content on the main branch. -``` - -f. Stage and commit your changes on the main branch: -``` -git add example.txt -git commit -m "Add main branch content" -``` - -Step 3: Create a Merge Conflict -a. Attempt to merge the feature-branch into main: - -``` -git merge feature-branch -``` - -At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. - - -Step 4: Resolve the Merge Conflict -a. Open the example.txt file in your code editor. - -b. You'll see Git's conflict markers, which look like this: - -``` -<<<<<<< HEAD -This is some content on the main branch. -======= -This is some content on the feature branch. ->>>>>>> feature-branch -``` - -c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: - -``` -This is some content on the main branch. - -This is some additional content on the feature branch. -``` - -d. Save the file. - - -Step 5: Commit the Resolved Merge Conflict -a. Stage the resolved file: - -``` -git add example.txt -``` - -b. Commit the changes: - -``` -git commit -m "Resolve merge conflict" -``` - -Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. - - - - - - From 5569c577e70c6e04c1187a07ee961e2205557834 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:47:37 +0530 Subject: [PATCH 18/53] Update challenge15.md --- Challenges/challenge15.md | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index e69de29bb..61c165e48 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -0,0 +1,151 @@ +## Welcome to Challenge 15 + +Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. + +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 15th challenge. + + +## Task: +Welcome to the 15th challenge! + +Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. + +Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: + +Task: +Create a Scenario for Merge Conflict: + +- Create a new project on your local system (e.g., a code project or a text file). + +- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. +Resolve the Merge Conflict: + +- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. + +- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. + +- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. + +- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. + +- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. + + +### Sample Example for merge conflict +Here is an example of a merge conflict: + + +Step 1: Set Up Your Repository +a. Create a new directory on your computer for your Git project: + +``` +mkdir merge-conflict-example +cd merge-conflict-example +``` + +b. Initialize the directory as a Git repository: + +``` +git init +``` + +Step 2: Create Two Branches +a. Create a new branch called feature-branch: + + ``` + git checkout -b feature-branch + + ``` +b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: + +``` +This is some content on the feature branch. +``` + +c. Stage and commit your changes: + +``` +git add example.txt +git commit -m "Add feature branch content" + +``` +d. Switch back to the main (or master) branch: + +``` +git checkout main +``` +e. Make changes to the same file, example.txt, in the main branch. For example: + +``` +This is some content on the main branch. +``` + +f. Stage and commit your changes on the main branch: +``` +git add example.txt +git commit -m "Add main branch content" +``` + +Step 3: Create a Merge Conflict +a. Attempt to merge the feature-branch into main: + +``` +git merge feature-branch +``` + +At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. + + +Step 4: Resolve the Merge Conflict +a. Open the example.txt file in your code editor. + +b. You'll see Git's conflict markers, which look like this: + +``` +<<<<<<< HEAD +This is some content on the main branch. +======= +This is some content on the feature branch. +>>>>>>> feature-branch +``` + +c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: + +``` +This is some content on the main branch. + +This is some additional content on the feature branch. +``` + +d. Save the file. + + +Step 5: Commit the Resolved Merge Conflict +a. Stage the resolved file: + +``` +git add example.txt +``` + +b. Commit the changes: + +``` +git commit -m "Resolve merge conflict" +``` + +Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. + + + + + + From 18afb45a742681a744725ecd6ae469db3737dbc7 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:15 +0530 Subject: [PATCH 19/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 61c165e48..5b2619caa 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -4,11 +4,11 @@ Congratulations on successfully completing the 14th challenge! This marks the co Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: -## Preqrequisites to mark completion of 1st Checkpoint (Milestone): +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): -1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. Once you have completed the above, you can proceed with the 15th challenge. From 68530559ed9d9bd5daa92f3ec2af2d04da880dcb Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:28 +0530 Subject: [PATCH 20/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 5b2619caa..f1195f81c 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -2,7 +2,7 @@ Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: ## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): From f678717789f64e9a1060a4fe8250f8cb14acdea4 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 16 Sep 2023 11:32:42 +0530 Subject: [PATCH 21/53] Create challengers-list.md --- challengers-list.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/challengers-list.md b/challengers-list.md index 848dec155..e69de29bb 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +0,0 @@ -# List of challengers -1. [Shivay](https://github.com/shivaylamba) -2. [shivscaler](http://github.com/shivscaler) From 209029fc0dce54b5dbfec9685fca0a4a4832e988 Mon Sep 17 00:00:00 2001 From: shivscaler <129844674+shivscaler@users.noreply.github.com> Date: Sun, 17 Sep 2023 10:58:15 +0530 Subject: [PATCH 22/53] Update challengers-list.md --- challengers-list.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/challengers-list.md b/challengers-list.md index e69de29bb..55587c56c 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -0,0 +1,2 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) From 13ea0d83f688af6365dd77066260668e7813ad53 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:00:09 +0530 Subject: [PATCH 23/53] add chall 21 Signed-off-by: veersen2001 --- Challenges/challenge21.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Challenges/challenge21.md diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md new file mode 100644 index 000000000..e69de29bb From 6ee987d64d8bbfd510321901408dad0539fcd147 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:11:06 +0530 Subject: [PATCH 24/53] add chall 21 Signed-off-by: veersen2001 --- Challenges/challenge21.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md index e69de29bb..653c66920 100644 --- a/Challenges/challenge21.md +++ b/Challenges/challenge21.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 21 + +Welcome to the 21st Challenge + +Today you will learn about project boards on GitHub + +### What are Github Project Boards? + +GitHub project boards helps you keep track of stuffs you're actively working on within your repository. You can say it's a project managemnet tool, or even a collaboration tool for teams. You create a project board with columns for your TODO or backlogs or even bugs, In progress activies and lastly a column for your finished tasks. You can sort of see it as a SCRUM board. To learn more [about project boards go through this link](https://help.github.com/en/github/managing-your-work-on-github/about-project-boards) + +## Tasks + +- Create a GitHub repository for any project you can think up +- On a sheet of paper create a TODO list (or backlog) of features you want to have in you app +- Create a project board with a `TODO` column, `In progress`, `Done` +- Create a card for all the items you already wrote on the sheet of paper in the TODO column +- Work on the features synchronously and move the card respectively for each in progress task to the `In progress` column +- When you're done with the `In progress` task move the card to the `Done` column + +## How to submit your entry + +- Take a screenshot of your project board for when you moved an card from `In progress` to `Done` +- Add you screenshot to the Github issue created in the previous challenges \ No newline at end of file From 322e47bcebbbe9497f7e893da51268dbb7cb4486 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:15 +0530 Subject: [PATCH 25/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 61c165e48..5b2619caa 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -4,11 +4,11 @@ Congratulations on successfully completing the 14th challenge! This marks the co Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: -## Preqrequisites to mark completion of 1st Checkpoint (Milestone): +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): -1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. Once you have completed the above, you can proceed with the 15th challenge. From 656f9039b144528ea249446c84fdb36426c24b24 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:28 +0530 Subject: [PATCH 26/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 5b2619caa..f1195f81c 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -2,7 +2,7 @@ Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: ## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): From 0cf0b025982b707d1ec0fc6f6c4465faba13abcc Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 16 Sep 2023 11:32:42 +0530 Subject: [PATCH 27/53] Create challengers-list.md Signed-off-by: veersen2001 --- challengers-list.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/challengers-list.md b/challengers-list.md index 848dec155..e69de29bb 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +0,0 @@ -# List of challengers -1. [Shivay](https://github.com/shivaylamba) -2. [shivscaler](http://github.com/shivscaler) From fc50b3b5b3dd9c8bd3c7ea7d04ecc9f82d44b0c3 Mon Sep 17 00:00:00 2001 From: shivscaler <129844674+shivscaler@users.noreply.github.com> Date: Sun, 17 Sep 2023 10:58:15 +0530 Subject: [PATCH 28/53] Update challengers-list.md Signed-off-by: veersen2001 --- challengers-list.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/challengers-list.md b/challengers-list.md index e69de29bb..55587c56c 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -0,0 +1,2 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) From 6a5a02a8be9a32e51ecdf243419bfb45226c685d Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:00:09 +0530 Subject: [PATCH 29/53] add chall 21 Signed-off-by: veersen2001 --- Challenges/challenge21.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Challenges/challenge21.md diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md new file mode 100644 index 000000000..e69de29bb From 7f779b4ee3904bd8919f7e57f81f7468837724ba Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 21 Sep 2023 11:11:06 +0530 Subject: [PATCH 30/53] add chall 21 Signed-off-by: veersen2001 --- Challenges/challenge21.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Challenges/challenge21.md b/Challenges/challenge21.md index e69de29bb..653c66920 100644 --- a/Challenges/challenge21.md +++ b/Challenges/challenge21.md @@ -0,0 +1,23 @@ +## Welcome to Challenge 21 + +Welcome to the 21st Challenge + +Today you will learn about project boards on GitHub + +### What are Github Project Boards? + +GitHub project boards helps you keep track of stuffs you're actively working on within your repository. You can say it's a project managemnet tool, or even a collaboration tool for teams. You create a project board with columns for your TODO or backlogs or even bugs, In progress activies and lastly a column for your finished tasks. You can sort of see it as a SCRUM board. To learn more [about project boards go through this link](https://help.github.com/en/github/managing-your-work-on-github/about-project-boards) + +## Tasks + +- Create a GitHub repository for any project you can think up +- On a sheet of paper create a TODO list (or backlog) of features you want to have in you app +- Create a project board with a `TODO` column, `In progress`, `Done` +- Create a card for all the items you already wrote on the sheet of paper in the TODO column +- Work on the features synchronously and move the card respectively for each in progress task to the `In progress` column +- When you're done with the `In progress` task move the card to the `Done` column + +## How to submit your entry + +- Take a screenshot of your project board for when you moved an card from `In progress` to `Done` +- Add you screenshot to the Github issue created in the previous challenges \ No newline at end of file From 0e8253769b028f2fc8b1ed8126745575ebe0d4bd Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Tue, 5 Sep 2023 21:33:09 +0530 Subject: [PATCH 31/53] Task 5 Completed --- contributors/Veersen2001/Veersen2001.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index 92a2c0924..e69de29bb 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,5 +0,0 @@ -Name: Veerbahadur Sen - -github_user_name : Veersen2001 - -Url_of_github_issue : https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From 894aa3f08694053c6a08175cd7ac00e4141062ee Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:22:36 +0530 Subject: [PATCH 32/53] Task 5 Completed --- contributors/Veersen2001/Veersen2001.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index e69de29bb..f97fac801 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -0,0 +1,2 @@ +name: Veerbahadur Sen +github_user_name: Veersen2001 \ No newline at end of file From 73fc137d2dcae2627c0e23323b6f401e1b2b4200 Mon Sep 17 00:00:00 2001 From: Veerbahadur Sen Date: Wed, 6 Sep 2023 21:55:39 +0530 Subject: [PATCH 33/53] Task 6 Completed --- contributors/Veersen2001/Veersen2001.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index f97fac801..2a88f096c 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,2 +1,3 @@ name: Veerbahadur Sen -github_user_name: Veersen2001 \ No newline at end of file +github_user_name: Veersen2001 +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From 07e3bb502bf8afdc3b4492df3fb0cd292fccbfa0 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 7 Sep 2023 11:41:38 +0530 Subject: [PATCH 34/53] challenge 7 add challenge 8 9 add 10th challenge Update challenge10.md Update challenge10.md update #2 11 Task 12 Completed Signed-off-by: shivaylamba challenge 13 add challenge 14 Update challenge14.md Create challenge15.md Update challenge15.md Update challenge15.md Update challenge15.md Create challenge16.md Create challengers-list.md chall 17 Signed-off-by: shivaylamba Update challengers-list.md add challenge 18 19 Signed-off-by: shivaylamba add chall 20 task Day 13 Completed --- Challenges/challenge10.md | 24 ------ Challenges/challenge14.md | 14 ---- Challenges/challenge15.md | 151 -------------------------------------- challengers-list.md | 2 - 4 files changed, 191 deletions(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index dfa8553b5..e69de29bb 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -1,24 +0,0 @@ -## Welcome to Challenge 10 - -Welcome to the 10th challenge! - -Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. - - -Task: -1. Checkout to the branch you created in Challenge 2 in your forked repository. - -2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. - -3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. - -4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. - -5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. - -6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. - -( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) - -7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). - diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index 7802e4986..e69de29bb 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -1,14 +0,0 @@ -## Welcome to Challenge 12 - -Welcome to the 12th Challenge - -Today's challenge is a re-practice of the 8th and 9th Challenge. - -So focus for this challenge will be to practice the ``git rebase`` command. - -Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ - -Task: -1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. -2. Once done, try to squash the commits in your pull request in the Challenge repository. -3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index f1195f81c..e69de29bb 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -1,151 +0,0 @@ -## Welcome to Challenge 15 - -Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. - -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: - -## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): - -1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. - -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. - - -Once you have completed the above, you can proceed with the 15th challenge. - - -## Task: -Welcome to the 15th challenge! - -Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. - -Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: - -Task: -Create a Scenario for Merge Conflict: - -- Create a new project on your local system (e.g., a code project or a text file). - -- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. -Resolve the Merge Conflict: - -- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. - -- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. - -- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. - -- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. - -- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. - - -### Sample Example for merge conflict -Here is an example of a merge conflict: - - -Step 1: Set Up Your Repository -a. Create a new directory on your computer for your Git project: - -``` -mkdir merge-conflict-example -cd merge-conflict-example -``` - -b. Initialize the directory as a Git repository: - -``` -git init -``` - -Step 2: Create Two Branches -a. Create a new branch called feature-branch: - - ``` - git checkout -b feature-branch - - ``` -b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: - -``` -This is some content on the feature branch. -``` - -c. Stage and commit your changes: - -``` -git add example.txt -git commit -m "Add feature branch content" - -``` -d. Switch back to the main (or master) branch: - -``` -git checkout main -``` -e. Make changes to the same file, example.txt, in the main branch. For example: - -``` -This is some content on the main branch. -``` - -f. Stage and commit your changes on the main branch: -``` -git add example.txt -git commit -m "Add main branch content" -``` - -Step 3: Create a Merge Conflict -a. Attempt to merge the feature-branch into main: - -``` -git merge feature-branch -``` - -At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. - - -Step 4: Resolve the Merge Conflict -a. Open the example.txt file in your code editor. - -b. You'll see Git's conflict markers, which look like this: - -``` -<<<<<<< HEAD -This is some content on the main branch. -======= -This is some content on the feature branch. ->>>>>>> feature-branch -``` - -c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: - -``` -This is some content on the main branch. - -This is some additional content on the feature branch. -``` - -d. Save the file. - - -Step 5: Commit the Resolved Merge Conflict -a. Stage the resolved file: - -``` -git add example.txt -``` - -b. Commit the changes: - -``` -git commit -m "Resolve merge conflict" -``` - -Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. - - - - - - diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..e69de29bb 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +0,0 @@ -# List of challengers -1. [Shivay](https://github.com/shivaylamba) From 503eee84ba5efb066a7f5001f4ca4fad6989f6f7 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 15:15:20 +0530 Subject: [PATCH 35/53] add 10th challenge Signed-off-by: veersen2001 --- Challenges/challenge10.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index e69de29bb..1d57c74b4 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -0,0 +1,24 @@ +## Welcome to Challenge 10 + +Welcome to the 10th challenge! + +Today's let's try to use the concept for Git Rebase you learnt but on a Pull Request. + + +Task: +1. Checkout to the branch you created in Challenge 2 in your forked repository. + +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. + +3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. + +4. For this. Review the commits you've made on the branch using the git log --oneline command. You should see a number of commits on the branch. Use the interactive rebase command to squash the commits. + +5. In the interactive rebase editor, change the word pick to squash (or s) for the commits you want to combine. Save and close the editor. Edit the combined commit message when prompted. Force push the changes to your forked repository. + +6. Check if the commit reflects in the Pull request you created in Challenge 5 in the main challenge repository. + +( If it does not, then sync your forked repository with the main repository and push the changes to your forked repository.) + +7. Take the screenshot of the terminal when you have successfully used the git rebase to squash the commits and post it in the comment created in the first challenge (challenge 1). + From 9bb7b173374cba3800f4e771424087bb38da0dc8 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:32:08 +0530 Subject: [PATCH 36/53] Update challenge10.md Signed-off-by: veersen2001 --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 1d57c74b4..e541f6529 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -6,7 +6,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: -1. Checkout to the branch you created in Challenge 2 in your forked repository. +1. Checkout to the branch you created in Challenge 3 in your forked repository. 2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. From 2a67342f659bb33d5a1bcfe5d495984f6700471c Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sun, 10 Sep 2023 16:33:06 +0530 Subject: [PATCH 37/53] Update challenge10.md Signed-off-by: veersen2001 --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index e541f6529..806fdacfd 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 3 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 3 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From 997339bc1aef7b29b3d199d45a0deccaff02ce89 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Sun, 10 Sep 2023 16:55:47 +0530 Subject: [PATCH 38/53] update #2 Signed-off-by: veersen2001 --- Challenges/challenge10.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge10.md b/Challenges/challenge10.md index 806fdacfd..6840ff7aa 100644 --- a/Challenges/challenge10.md +++ b/Challenges/challenge10.md @@ -8,7 +8,7 @@ Today's let's try to use the concept for Git Rebase you learnt but on a Pull Req Task: 1. Checkout to the branch you created in Challenge 3 in your forked repository. -2. Create another commit by making some change in the markdown file (``your_github_username-details.md``) you created in Challenge 5 and push the change to your forked repository. +2. Create another commit by making some change in the markdown file (`.md`) you created in Challenge 5 and push the change to your forked repository. 3. Now, we will use the concept of Git Rebase to squash the last two commits into one commit. From c21204d47c8687695bb0f387626b5625a2725a04 Mon Sep 17 00:00:00 2001 From: shivaylamba Date: Thu, 14 Sep 2023 11:19:30 +0530 Subject: [PATCH 39/53] add challenge 14 Signed-off-by: veersen2001 --- Challenges/challenge14.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index e69de29bb..7802e4986 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -0,0 +1,14 @@ +## Welcome to Challenge 12 + +Welcome to the 12th Challenge + +Today's challenge is a re-practice of the 8th and 9th Challenge. + +So focus for this challenge will be to practice the ``git rebase`` command. + +Ensure to practice the ``git rebase`` command by creating your own local git repository. You can checkout this guide: https://www.freecodecamp.org/news/git-squash-explained/ + +Task: +1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. +2. Once done, try to squash the commits in your pull request in the Challenge repository. +3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file From 4a2d7633202eca2a8142bf6ba22263526531012d Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Thu, 14 Sep 2023 11:20:25 +0530 Subject: [PATCH 40/53] Update challenge14.md Signed-off-by: veersen2001 --- Challenges/challenge14.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge14.md b/Challenges/challenge14.md index 7802e4986..09af080d9 100644 --- a/Challenges/challenge14.md +++ b/Challenges/challenge14.md @@ -1,6 +1,6 @@ -## Welcome to Challenge 12 +## Welcome to Challenge 14 -Welcome to the 12th Challenge +Welcome to the 14th Challenge Today's challenge is a re-practice of the 8th and 9th Challenge. @@ -11,4 +11,4 @@ Ensure to practice the ``git rebase`` command by creating your own local git rep Task: 1. Practice git rebase, and how to squash commit using git rebase in your local projects. For this you can make some changes in the branch and the file created in Challenge 3 & 5. 2. Once done, try to squash the commits in your pull request in the Challenge repository. -3. Also do sign your commits, covered in the Challenge 12. \ No newline at end of file +3. Also do sign your commits, covered in the Challenge 12. From 5c80c727e28654926ca7e24061f6b94e88003b77 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:46:49 +0530 Subject: [PATCH 41/53] Create challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index e69de29bb..61c165e48 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -0,0 +1,151 @@ +## Welcome to Challenge 15 + +Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. + +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: + +## Preqrequisites to mark completion of 1st Checkpoint (Milestone): + +1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. + +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. + + +Once you have completed the above, you can proceed with the 15th challenge. + + +## Task: +Welcome to the 15th challenge! + +Read this [article on merge conflicts](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) as it is very important. + +Today is the first part of a two-part challenge related to resolving merge conflicts. To get started, follow these steps: + +Task: +Create a Scenario for Merge Conflict: + +- Create a new project on your local system (e.g., a code project or a text file). + +- Intentionally make changes to the same lines of code or content in different branches of your project to create a scenario where a merge conflict would occur during a merge or pull request. +Resolve the Merge Conflict: + +- Follow the steps outlined in this [article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to understand how to resolve merge conflicts. + +- Use the techniques mentioned in the article to resolve the conflict you intentionally created in your project. + +- Share Screenshot: Take a screenshot of your terminal or Git client when you are resolving the merge conflict. + +- Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. + +- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. + + +### Sample Example for merge conflict +Here is an example of a merge conflict: + + +Step 1: Set Up Your Repository +a. Create a new directory on your computer for your Git project: + +``` +mkdir merge-conflict-example +cd merge-conflict-example +``` + +b. Initialize the directory as a Git repository: + +``` +git init +``` + +Step 2: Create Two Branches +a. Create a new branch called feature-branch: + + ``` + git checkout -b feature-branch + + ``` +b. Create a file and make some changes in it. For example, create a file named example.txt and add the following content: + +``` +This is some content on the feature branch. +``` + +c. Stage and commit your changes: + +``` +git add example.txt +git commit -m "Add feature branch content" + +``` +d. Switch back to the main (or master) branch: + +``` +git checkout main +``` +e. Make changes to the same file, example.txt, in the main branch. For example: + +``` +This is some content on the main branch. +``` + +f. Stage and commit your changes on the main branch: +``` +git add example.txt +git commit -m "Add main branch content" +``` + +Step 3: Create a Merge Conflict +a. Attempt to merge the feature-branch into main: + +``` +git merge feature-branch +``` + +At this point, you'll encounter a merge conflict because both branches have made changes to the same part of the example.txt file. + + +Step 4: Resolve the Merge Conflict +a. Open the example.txt file in your code editor. + +b. You'll see Git's conflict markers, which look like this: + +``` +<<<<<<< HEAD +This is some content on the main branch. +======= +This is some content on the feature branch. +>>>>>>> feature-branch +``` + +c. Manually edit the file to decide which changes to keep. Remove the conflict markers and choose the content you want to keep. For example: + +``` +This is some content on the main branch. + +This is some additional content on the feature branch. +``` + +d. Save the file. + + +Step 5: Commit the Resolved Merge Conflict +a. Stage the resolved file: + +``` +git add example.txt +``` + +b. Commit the changes: + +``` +git commit -m "Resolve merge conflict" +``` + +Now, you've successfully created a scenario for a merge conflict, resolved it, and committed the changes. You can use these steps as a practical exercise to understand how merge conflicts work in Git. + + + + + + From 872b326c11e9182e3aef1de50dae666bf36c5571 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:47:37 +0530 Subject: [PATCH 42/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 61c165e48..ffb8360c6 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -37,7 +37,7 @@ Resolve the Merge Conflict: - Share this screenshot in the issue you created during the first challenge (Challenge 1) to demonstrate that you have successfully resolved a merge conflict. -- By completing this challenge, you'll gain valuable experience in dealing with merge conflicts, a common occurrence in collaborative Git projects. + ### Sample Example for merge conflict From 994f4604f6c1f93fc93d4f1c48af06de9e8c2f80 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:15 +0530 Subject: [PATCH 43/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index ffb8360c6..5085e1976 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -4,11 +4,11 @@ Congratulations on successfully completing the 14th challenge! This marks the co Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: -## Preqrequisites to mark completion of 1st Checkpoint (Milestone): +## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): -1. Use the creative shared for the successful completion of the first milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the first milestone. +1. Use the creative shared for the successful completion of the second milestone: [Second Milestone Creative](https://github-production-user-asset-6210df.s3.amazonaws.com/129844674/268165917-34df9c63-be61-4ffc-af43-264703f89f0a.jpg) to share on any social platform: LinkedIn, Twitter, Facebook, Instagram, etc. marking the completion of the second milestone. -2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the first milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. +2. Fill the Google form the following Google form: [Google Form](https://forms.gle/JnzBURSEjRejEgw4A) to mark the completion of the second milestone. Note: This is a mandatory task to be eligible for the prize at the end of the challenge as it allows us to evaluate the submissions in the challenge so far. Once you have completed the above, you can proceed with the 15th challenge. From 9912dc97ed2556a3fe8c9a350fdf8d43ccbe66f8 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Fri, 15 Sep 2023 09:49:28 +0530 Subject: [PATCH 44/53] Update challenge15.md Signed-off-by: veersen2001 --- Challenges/challenge15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Challenges/challenge15.md b/Challenges/challenge15.md index 5085e1976..650b5cbb0 100644 --- a/Challenges/challenge15.md +++ b/Challenges/challenge15.md @@ -2,7 +2,7 @@ Congratulations on successfully completing the 14th challenge! This marks the completion of the second milestone of the challenge. -Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 1st milestone: +Before you proceed with the 15th challenge, ensure you are required to have completed the following tasks to successfully mark the completion of the 2nd milestone: ## Preqrequisites to mark completion of 2nd Checkpoint (Milestone): From 2f0b537b21bb413f691d73eb8478e617053dbc14 Mon Sep 17 00:00:00 2001 From: Shivay Lamba Date: Sat, 16 Sep 2023 11:32:42 +0530 Subject: [PATCH 45/53] Create challengers-list.md Signed-off-by: veersen2001 --- challengers-list.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/challengers-list.md b/challengers-list.md index e69de29bb..55587c56c 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -0,0 +1,2 @@ +# List of challengers +1. [Shivay](https://github.com/shivaylamba) From 56c568bb51865c53dce9ff12d5995c52829b32e5 Mon Sep 17 00:00:00 2001 From: shivscaler <129844674+shivscaler@users.noreply.github.com> Date: Sun, 17 Sep 2023 10:58:15 +0530 Subject: [PATCH 46/53] Update challengers-list.md Signed-off-by: veersen2001 --- challengers-list.md | 1 + 1 file changed, 1 insertion(+) diff --git a/challengers-list.md b/challengers-list.md index 55587c56c..848dec155 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,2 +1,3 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) +2. [shivscaler](http://github.com/shivscaler) From dcbdd770e999f7ad70d530303bf9b7e8d7cac1b9 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Fri, 22 Sep 2023 22:38:27 +0530 Subject: [PATCH 47/53] Task Day 16 Complted --- challengers-list.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/challengers-list.md b/challengers-list.md index e69de29bb..d259f531e 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -0,0 +1,3 @@ +name : Veerbahadur Sen +github-Username: Veersen2001 +Github Profile:https://github.com/Veersen2001 \ No newline at end of file From 70e690ecaadc8c1451d7d972b8c117a55a30a982 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Fri, 22 Sep 2023 22:50:47 +0530 Subject: [PATCH 48/53] scaler --- challengers-list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challengers-list.md b/challengers-list.md index d259f531e..4fa28aae1 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,3 @@ name : Veerbahadur Sen github-Username: Veersen2001 -Github Profile:https://github.com/Veersen2001 \ No newline at end of file +Github Profile: \ No newline at end of file From fea5b8fce2fc50f105969c7a1370553341e44202 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Sat, 23 Sep 2023 21:31:15 +0530 Subject: [PATCH 49/53] Task 16 Completed --- challengers-list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challengers-list.md b/challengers-list.md index 4fa28aae1..d259f531e 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,3 @@ name : Veerbahadur Sen github-Username: Veersen2001 -Github Profile: \ No newline at end of file +Github Profile:https://github.com/Veersen2001 \ No newline at end of file From e9b8bd12bc47efe5a08e71ce07575f349ca1e408 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Sun, 24 Sep 2023 21:57:55 +0530 Subject: [PATCH 50/53] Task 17 completd --- challengers-list.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/challengers-list.md b/challengers-list.md index d259f531e..e4751862f 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,3 +1,4 @@ -name : Veerbahadur Sen -github-Username: Veersen2001 -Github Profile:https://github.com/Veersen2001 \ No newline at end of file +# List of challengers +1. [Shivay](https://github.com/shivaylamba) +2. [shivscaler](http://github.com/shivscaler) +3. [Veerbahadur]() \ No newline at end of file From 228d91814d8c4aafa39ca455b7a94bce36a41093 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Sun, 24 Sep 2023 21:58:51 +0530 Subject: [PATCH 51/53] Task 17 completd --- challengers-list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challengers-list.md b/challengers-list.md index e4751862f..882662489 100644 --- a/challengers-list.md +++ b/challengers-list.md @@ -1,4 +1,4 @@ # List of challengers 1. [Shivay](https://github.com/shivaylamba) 2. [shivscaler](http://github.com/shivscaler) -3. [Veerbahadur]() \ No newline at end of file +3. [Veerbahadur](https://github.com/Veersen2001) \ No newline at end of file From cfd67a2bb68eb57846b5f8e3574385c35444e369 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Sun, 24 Sep 2023 22:15:52 +0530 Subject: [PATCH 52/53] Scaler --- contributors/Veersen2001/Veersen2001.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index 2a88f096c..66363af40 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,3 +1,3 @@ -name: Veerbahadur Sen +Name: Veerbahadur Sen github_user_name: Veersen2001 url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file From e57ea9e46153de31c8e74382864e0a6bc8dcb540 Mon Sep 17 00:00:00 2001 From: veersen2001 Date: Wed, 27 Sep 2023 23:18:02 +0530 Subject: [PATCH 53/53] Task Day-23 completed --- contributors/Veersen2001/Veersen2001.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contributors/Veersen2001/Veersen2001.md b/contributors/Veersen2001/Veersen2001.md index 66363af40..6a5fac11c 100644 --- a/contributors/Veersen2001/Veersen2001.md +++ b/contributors/Veersen2001/Veersen2001.md @@ -1,3 +1,6 @@ Name: Veerbahadur Sen github_user_name: Veersen2001 -url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 \ No newline at end of file +url_of_github_issue: https://github.com/scaleracademy/scaler-open-source-september-challenge/issues/492#issue-1878970719 +favroite_programming_language:JavaScript +hosted_github_pages_link: https://veersen2001.github.io/ +hosted_github_pages_repository_link: https://github.com/Veersen2001/Veersen2001.github.io.git \ No newline at end of file