Skip to content

Commit e1a84d7

Browse files
Update README.md of existing exercises (#161)
# Exercise Review ## Exercise Discussion Fixes #160 ## Checklist - [ ] If you require a new remote repository on the `Git-Mastery` organization, have you [created a request](https://github.com/git-mastery/exercises/issues/new?template=request_exercise_repository.md) for it? - [ ] Have you written unit tests using [`repo-smith`](https://github.com/git-mastery/repo-smith) to validate the exercise grading scheme? - [X] Have you tested the download script using `test-download.sh`? - [X] Have you verified that this exercise does not already exist or is not currently in review? - [ ] Did you introduce a new grading mechanism that should belong to [`git-autograder`](https://github.com/git-mastery/git-autograder)? - [ ] Did you introduce a new dependency that should belong to [`app`](https://github.com/git-mastery/app)?
2 parents 3d6eca2 + 92dad34 commit e1a84d7

File tree

23 files changed

+23
-411
lines changed

23 files changed

+23
-411
lines changed

branch_bender/README.md

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1 @@
1-
# branch-bender
2-
3-
You are building the latest webapp with the coolest features like login, payments, and dashboard.
4-
5-
## Task
6-
7-
You have been working on all of these changes on separate branches and you now want to merge them all into `main`.
8-
9-
### Task 1
10-
11-
Merge the `feature/login` branch into `main` first. Make sure you do not use fast forwarding when merging!
12-
13-
### Task 2
14-
15-
Merge the `feature/dashboard` branch into `main` next.
16-
17-
### Task 3
18-
19-
Merge the `feature/payment` branch into `main` last.
20-
21-
## Final state
22-
23-
The final Git graph (using `git log --oneline --graph`) should look like this:
24-
25-
```mermaid
26-
gitGraph
27-
commit
28-
branch feature/login
29-
checkout main
30-
branch feature/dashboard
31-
checkout main
32-
branch feature/payment
33-
checkout feature/login
34-
commit
35-
commit
36-
checkout main
37-
merge feature/login
38-
checkout feature/dashboard
39-
commit
40-
commit
41-
commit
42-
checkout main
43-
merge feature/dashboard
44-
checkout feature/payment
45-
commit
46-
commit
47-
checkout main
48-
merge feature/payment
49-
```
1+
See https://git-mastery.github.io/lessons/merge/exercise-branch-bender.html

branch_delete/README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
1-
# branch-delete
2-
3-
## Task
4-
5-
You have two branches: `optimization-approach-1` and `optimization-approach-2` and you need to delete them!
6-
7-
You decided to go ahead with `optimization-approach-1` so you merged it and you can delete the branch already.
8-
9-
Since you don't need `optimization-approach-2`, you should delete it WITHOUT merging.
10-
11-
1. Delete the `optimization-approach-1` branch
12-
2. Delete the `optimization-approach-2` branch safely
1+
See https://git-mastery.github.io/lessons/branchDelete/exercise-branch-delete.html

branch_forward/README.md

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1 @@
1-
# branch-forward
2-
3-
You are writing the outline for a story. You now have two parallel storylines in two branches.
4-
5-
## Task
6-
7-
1. Review the `with-sally` and `with-ginny` branches.
8-
2. Merge only the branch(es) that can be fast-forwarded into `main`.
9-
3. Leave other branches (if any) unmerged.
10-
11-
## Hints
12-
13-
<details>
14-
15-
<summary>Hint 1</summary>
16-
17-
Ensure you have switched to the destination branch before initiating the merge.
18-
19-
</details>
1+
See https://git-mastery.github.io/lessons/merge/exercise-branch-forward.html

branch_rename/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
# branch-rename
2-
3-
You have been working on the login feature for your application on the branch `login`. However, to keep things consistent across other branches, you need to rename it to `feature/login`.
4-
5-
## Task
6-
7-
Rename the `login` branch to `feature/login`.
1+
See https://git-mastery.github.io/lessons/branchRename/exercise-branch-rename.html

clone_repo/README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
# clone-repo
2-
3-
## Task
4-
5-
1. Fork the repo <https://github.com/git-mastery/gm-shapes> to your GitHub account, if you haven't done so already. Retain the original repo name `gm-shapes`.
6-
1. Clone the fork to your computer, in to the folder `clone-repo/shapes` (note how the target folder is `shapes`, not `gm-shapes`).
7-
1. Set up a remote named `upstream`, to point to the git-mastery/gm-shapes repo.
8-
1+
See https://git-mastery.github.io/lessons/clone/exercise-clone-repo.html

conflict_mediator/README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
1-
# conflict-mediator
2-
3-
You have been called in mediate a conflict between two developers.
4-
5-
John wants to change the script to print "Hello World!", while Josh wants to change the script to print "Hello Everyone!" and they cannot come to a compromise.
6-
7-
## Task
8-
9-
Try to merge Josh's branch (branch name `josh`) into `main`. You should encounter a merge conflict.
10-
11-
Fix the merge conflict created by merging both John's and Josh's changes, setting the text to "Hello Everyone and World!" instead.
12-
1+
See https://git-mastery.github.io/lessons/mergeConflicts/exercise-conflict-mediator.html

fetch_and_pull/README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
# fetch-and-pull
2-
3-
## Task
4-
5-
You have been given a clone of the `git-mastery/gm-shapes` repo.
6-
7-
Another developer Alice's has created a remote copy of this repo at <https://github.com/git-mastery/gm-shapes-alice> which seems to have an additional commit in the `main` branch.
8-
9-
Add that repo as a remote titled `alice-upstream`, and bring over Alice's additional commit to your repo.
10-
11-
Alice's friend Bob has copied Alice's repo to <https://github.com/git-mastery/gm-shapes-bob>, and added one more commit.
12-
13-
Add that repo as another remote titled `bob-remote`, and fetch (not pull or merge) his new commit to your repo.
14-
1+
See https://git-mastery.github.io/lessons/pull/exercise-fetch-and-pull.html

fork_repo/README.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1 @@
1-
# fork-repo
2-
3-
<!--- Insert exercise description -->
4-
5-
## Task
6-
7-
Create a fork of the repo <https://github.com/git-mastery/gm-shapes> to your
8-
GitHub account.
9-
10-
Retain the original repo name `gm-shapes`.
1+
See https://git-mastery.github.io/lessons/fork/exercise-fork-repo.html

grocery_shopping/README.md

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1 @@
1-
# grocery-shopping
2-
3-
You have been tasked to go grocery shopping for the week.
4-
5-
Inside `shopping-list.txt`, you will find your shopping list items. As you walk around the grocery shop, you remove items from the shopping list that you found. You also notice that your shopping list is missing several things that you cannot find in the current grocery store, so you start adding to the shopping list.
6-
7-
## Task
8-
9-
Edit `shopping-list.md` and remove at least one item from the shopping list and add at least one new item to the shopping list.
10-
11-
## Hints
12-
13-
<details>
14-
15-
<summary>Hint 1</summary>
16-
17-
Have you removed at least one item from the shopping list?
18-
19-
</details>
20-
21-
<details>
22-
23-
<summary>Hint 2</summary>
24-
25-
Have you added at least one (new) item to the shopping list? This item must not have been in the original shopping list.
26-
27-
</details>
28-
29-
<details>
30-
31-
<summary>Hint 3</summary>
32-
33-
Not seeing your changes? Are you sure you have run `git add shopping-list.txt` and run `bash submit.sh`?
34-
35-
</details>
36-
37-
<details>
38-
39-
<summary>Hint 4</summary>
40-
41-
Try to change the file to:
42-
43-
```md
44-
- Apples
45-
- Pears
46-
```
47-
48-
</details>
49-
1+
See https://git-mastery.github.io/lessons/commit/exercise-grocery-shopping.html

ignoring_somethings/README.md

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# ignoring-somethings
2-
3-
You have stumbled upon a repository with an existing `.gitignore`. However, you
4-
have discovered that the `.gitignore` is not as accurate as you would like it to
5-
be.
6-
7-
Some files are showing up when they should be hidden, and some files are hidden
8-
when they should be present.
9-
10-
## Task
11-
12-
1. While you wish to continue ignoring every file in the `many/` folder, you
13-
want to un-ignore just `many/file22.txt`
14-
2. `why_am_i_hidden.txt` should not be hidden
15-
3. `ignore_me.txt` should be hidden
16-
4. Hide the `runaway.txt` file in `this/`, however, you don't know how many
17-
layers of nesting it is under, so use the pattern matching syntax
1+
See https://git-mastery.github.io/lessons/ignore/exercise-ignoring-something.html

0 commit comments

Comments
 (0)