Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

Commit

Permalink
Squashed Challenge7
Browse files Browse the repository at this point in the history
  • Loading branch information
Rishav986 authored and Ashwani132003 committed Sep 7, 2022
1 parent 6d14cab commit a92c6bc
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
19 changes: 19 additions & 0 deletions Challenges/challenge_6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## 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-september-open-source-challenge/blob/main/Challenges/challenge_5.md?plain=1)

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
---
```
3. After making this change create a commit with a proper commit message and push the changes
4. Check if the commit reflects in the Pull request you created in Challenge 5

9 changes: 9 additions & 0 deletions Challenges/challenge_7.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## Welcome to Challenge 7

Welcome to the seventh challenge!
Today's goal is to implement the squashing of the git commits. Squashing is used to combine multiple commits into one. This is done using the interactive mode of Git Rebase command.
In the [6th Challenge](https://github.com/scaleracademy/scaler-september-open-source-challenge/blob/main/Challenges/challenge_6.md?plain=1) all of you created an additional commit to update the markdown file.
So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge.

Task:
1. Using the interactive mode of Git Rebase command combine the multiple commits created in your Pull requests and then push that to the Pull request you have created in the previous challenges.
5 changes: 5 additions & 0 deletions contributors/Rishav986/Rishav986.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
name: Rishav Siwach
github_user_name: Rishav986
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/215
---

0 comments on commit a92c6bc

Please sign in to comment.