Skip to content

Commit

Permalink
new squash
Browse files Browse the repository at this point in the history
update #2

11
  • Loading branch information
shivaylamba authored and Kamveno committed Sep 11, 2023
1 parent f00385d commit 212af8b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Challenges/challenge10.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 (`<YOUR-GITHUB-USERNAME>.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.

Expand Down
11 changes: 11 additions & 0 deletions Challenges/challenge11.md
Original file line number Diff line number Diff line change
@@ -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/<YOUR-GITHUB_USERNAME>/`` 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.

0 comments on commit 212af8b

Please sign in to comment.