Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task2 #74

Open
wants to merge 18 commits into
base: task2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 5 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
# Git_Ready
* The contest will be of duration one and a half hours after which no responses will be considered
* Do follow the PR Template to get your score raised in the leadreboard:)
* There are three tasks with each task being in a different branch
* Checkout to the branch task1 for the first task

## Task 2

This task consists of the following steps.

### Step 1

- Checkout to `task2` branch.
- Create a text file named as `github-username.txt`. For example, if github username is *prakriti583* then file name will be `prakriti583.txt`.
- Write the name of your Room Mate in the first line of the file.
- Commit this change.

## Step 2

- Create a new branch `feature` (and switch to it) from `task2` branch.
- Mention two of his/her habits that annoy you on **lines 2 and 3** of the file.
- Commit this change.

## Step 3

- Switch back to the `task2` branch.
- Write 2-3 sentences on what misconceptions you had about them initially, just below their name i.e. on lines 2 and 3.
- Commit this change.

## Final step

- Bring the changes from `feature` branch into the `task2` branch.

*At the end of this task, you should have exactly 4 commits and the data entered in both step 2 & 3 must be present in the file. Push these changes and make a PR. Be sure to mention the Issue No. as well in the PR.*

<hr>

Checkout to branch `task3` for the next task.
## **All The Best!!**
8 changes: 8 additions & 0 deletions k7aditya.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Goransh Barde

1) Asks all the day tune ye dekha hai tune wo dekha hai
2) Turns off the light at night when I had to study

1) I thought he would be Marathi because many people in Maharashtra has this surname
2) I thought IIIT aya hai to pdta bhi hoga