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

Commit 4cb9256

Browse files
shivaylambaRishav986
authored andcommitted
Signed-off-by: Rishav986 <starsiwach132003@gmail.com>
Signed-off-by: Rishav986 <starsiwach132003@gmail.com> Squashed Challenge7 Signed-off-by: Rishav986 <starsiwach132003@gmail.com>
1 parent 1c8b274 commit 4cb9256

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

Challenges/challenge_5.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Welcome to Challenge 5
22

3-
Welcome to the fourth challenge!
3+
Welcome to the fifth challenge!
44
Today's goal is to update your forked repository and then create a Pull Request
55

66
Task
@@ -25,4 +25,4 @@ name: your_name
2525
github_user_name: YOUR-GITHUB-USERNAME
2626
---
2727
```
28-
5. Submit your Pull Request
28+
5. Submit your Pull Request on the main challenge repo.

Challenges/challenge_6.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Welcome to Challenge 6
2+
3+
Welcome to the sixth challenge!
4+
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)
5+
6+
Task
7+
1. Create a new commit in the branch you created in Challenge 2 in your forked repository
8+
2. The change that you have to make should be the following:
9+
In the markdown file that was created in Challenge 5, edit the details as follows:
10+
```
11+
---
12+
name: your_name
13+
github_user_name: YOUR-GITHUB-USERNAME
14+
url_of_github_issue: Link_of_the_github_issue_created_in_first_challenge
15+
---
16+
```
17+
3. After making this change create a commit with a proper commit message and push the changes
18+
4. Check if the commit reflects in the Pull request you created in Challenge 5
19+

Challenges/challenge_7.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## Welcome to Challenge 7
2+
3+
Welcome to the seventh challenge!
4+
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.
5+
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.
6+
So refer to [this guide](https://www.freecodecamp.org/news/git-squash-explained/) on Git merge.
7+
8+
Task:
9+
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.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: Rishav Siwach
3+
github_user_name: Rishav986
4+
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/215
5+
---

0 commit comments

Comments
 (0)