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

Commit 03fd726

Browse files
author
Manas Sahoo
committed
Squash all commits
Signed-off-by: Manas Sahoo <[email protected]>
1 parent 6d14cab commit 03fd726

File tree

5 files changed

+51
-0
lines changed

5 files changed

+51
-0
lines changed

Challenges/challenge_6.md

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

Challenges/challenge_7.md

+9
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.

Challenges/challenge_8.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Welcome to Challenge 8
2+
3+
Welcome to the 8th challenge!
4+
5+
Today's challenge is simple. But along side the task, please give the [following article](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) a read, as this will be used in Challenge 9.
6+
7+
Task:
8+
9+
1. Inside the branch you created during the prior challenges in your 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 markwdown file and push the change
10+
11+
2. Ensure the change appears in the Pull request created in previous challenges
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: Manas Sahoo
3+
github_user_name: manassahoo-dev
4+
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/360
5+
---
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: Manas Sahoo
3+
github_user_name: manassahoo-dev
4+
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/360
5+
---

0 commit comments

Comments
 (0)