You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
2. Once you're in the project directory, run the below command. It will
15
+
output a file path, which you can copy and paste into your browser URL input
16
+
to open the project.
17
+
```
18
+
echo "$(pwd)/index.html"
39
19
```
40
20
41
-
---
42
-
43
-
### Creating your branch:
44
-
3. Now we are going to create a branch specifically for you to work on. There are two types of branches that we can use
45
-
46
-
| Local | Remote |
47
-
| --- | --- |
48
-
| Stored on your computer | Stored on Github |
49
-
50
-
- Today we will be creating a local branch and publishing it onto the workshop repository
51
-
52
-
We can create our branch a couple different ways:
21
+
If on windows:
22
+
```
23
+
echo %cd%\index.html
24
+
```
53
25
54
-
<details>
55
-
<summary> Using Git Checkout</summary>
56
-
git checkout -b [INSERT YOUR BRANCH NAME]
57
-
</details>
26
+
## Contributing
27
+
Make **3 pull requests** as described below. Branch names should follow a convention of:
58
28
59
-
<details>
60
-
<summary> Using Git Branch</summary>
61
-
git branch [INSERT YOUR BRANCH NAME]
29
+
`NAME/DATE_short_description`, i.e. `andy/20270601_add_pancake_recipe`
62
30
63
-
git checkout [INSERT YOUR BRANCH NAME]
64
-
</details>
31
+
### 1. Add Your Own Recipe
32
+
- Create a new `.html` file with your recipe.
33
+
- Link to it from `index.html`.
34
+
- In your pull request description, **include a screenshot** of your recipe page.
65
35
66
-
---
36
+
### 2. Modify an Existing Recipe
37
+
- On a separate branch, open a PR that **changes one ingredient or step** in an existing recipe.
67
38
68
-
### Pushing your changes:
69
-
4. We want to make sure we are currently on our new branch.
70
-
-Make sure to use <codestyle="color:#A9FFF7">git branch</code> to view the branch you are on.
71
-
-You can switch to your branch by using "<codestyle="color:#A9FFF7">git checkout [INSERT YOUR BRANCH NAME]</code>"
39
+
### 3. Add a "Food Critic" Section
40
+
- On a third branch that branches **from the same branch as your recipe PR**, add a `<div>` below your recipe labeled **"Food Critic Review"** or similar.
41
+
-This PR should **depend on the recipe PR** and point to your original recipe branch
42
+
-In this PR description, add a note like `merge #NUMBER first!`
72
43
73
-
Steps:
74
-
1. Change line 144 in your index.html to your name.
75
-
2. In your terminal, you want to commit the changes you have made so type the following:
76
-
```
77
-
git commit -m "[INSERT YOUR MESSAGE HERE]" index.html
78
-
```
79
-
3. Once this is complete, you've officially made your first commit.
80
-
4. Then type <code style="color:#A9FFF7">git push</code> into your terminal
81
-
---
82
-
### Check for everyone else's branches
83
-
5. Remember <code style="color:#A9FFF7">git fetch</code>? Now we should be able to see everyone else's branches on the remote repository when we type <code style="color:#A9FFF7">git fetch</code>.
84
-
85
-
86
-
---
87
-
## <code style="color:#6D98BA"> Congrats, you know the basics of committing and pushing to Git! </code>
44
+
## A completed 3 pull requests should look like:
45
+
```
46
+
main
47
+
│
48
+
├───▶ YOUR_NAME/DATE_add-my-recipe (PR #1: Your new recipe)
<li>You can easily compare versions to understand what was added, modified, or deleted.</li>
31
-
</ul>
32
-
<li>Collaboration:</li>
33
-
<ul>
34
-
<li>Git facilitates collaboration among multiple developers on the same project.</li>
35
-
<li>Multiple people can work on different branches and merge their changes seamlessly.</li>
36
-
</ul>
37
-
<li>Branching and Merging:</li>
38
-
<ul>
39
-
<li>Git makes it easy to create branches for different features or bug fixes.</li>
40
-
<li>You can merge branches back into the main codebase when they are ready.</li>
41
-
</ul>
42
-
<li>Undo and Rollback:</li>
43
-
<ul>
44
-
<li>Git allows you to undo changes or roll back to a previous state of your code.</li>
45
-
<li>This can be invaluable for fixing mistakes or dealing with unexpected issues.</li>
46
-
</ul>
47
-
<li>Security and Data Integrity:</li>
48
-
<ul>
49
-
<li>Git ensures data integrity through cryptographic checksums (SHA-1 hashes) for every file and commit.</li>
50
-
<li>It's difficult for unauthorized users to alter the history or codebase.</li>
51
-
</ul>
52
-
<li>History and Documentation:</li>
53
-
<ul>
54
-
<li>Git's commit history provides a detailed record of all changes, including who made them and why.</li>
55
-
<li>This serves as valuable documentation for project evolution.</li>
56
-
</ul>
57
-
<li>And more!</li>
58
-
</ol>
59
-
<p>TL;DR: Git version control offers a robust and flexible way to manage code, collaborate with others, and maintain the integrity and history of your projects, making it an essential tool for developers and teams of all sizes.</p>
60
-
</div>
61
-
62
-
<divid="GitCommands" class="tabcontent">
63
-
<h3>Git Cheat Sheet</h3>
64
-
<code>git init</code>
65
-
<ul>
66
-
<li>Initializes a new Git repository in the current directory.</li>
67
-
</ul>
68
-
<code>git clone [repository URL]</code>
69
-
<ul>
70
-
<li>Creates a copy (clone) of a remote Git repository to your local machine.</li>
71
-
</ul>
72
-
<code>git add [file(s)]</code>
73
-
<ul>
74
-
<li>Stages changes for commit. You can specify specific files or use "." to add all changes.</li>
75
-
</ul>
76
-
<code>git commit -m "[commit message]"</code>
77
-
<ul>
78
-
<li>Records staged changes in a commit with a descriptive message.</li>
79
-
</ul>
80
-
<code>git status</code>
81
-
<ul>
82
-
<li>Shows the status of your working directory, including untracked, modified, and staged files.</li>
83
-
</ul>
84
-
<code>git log</code>
85
-
<ul>
86
-
<li>Displays a history of commits in the repository, including commit hashes, authors, dates, and messages.</li>
87
-
</ul>
88
-
<code>git branch</code>
89
-
<ul>
90
-
<li>Lists all branches in the repository and indicates the currently active branch with an asterisk (*).</li>
91
-
</ul>
92
-
<code>git checkout [branch or commit]</code>
93
-
<ul>
94
-
<li>Switches to a different branch or a specific commit. Helpful for navigating your project's history.</li>
95
-
</ul>
96
-
<code>git pull</code>
97
-
<ul>
98
-
<li>Fetches changes from the remote repository and merges them into the current branch (usually the default branch).</li>
99
-
</ul>
100
-
<code>git push</code>
101
-
<ul>
102
-
<li>Pushes your local commits to the remote repository, keeping it up to date.</li>
103
-
</ul>
104
-
<code>git merge [branch]</code>
105
-
<ul>
106
-
<li>Merges changes from a specified branch into the current branch.</li>
107
-
</ul>
108
-
<code>git remote -v</code>
109
-
<ul>
110
-
<li>Lists the remote repositories linked to your local repository, showing their URLs.</li>
111
-
</ul>
112
-
<code>git fetch</code>
113
-
<ul>
114
-
<li>Fetches changes from the remote repository but doesn't automatically merge them into the current branch.</li>
115
-
</ul>
116
-
<code>git reset [file]</code>
117
-
<ul>
118
-
<li>Unstages changes from the staging area, or use with "--hard" to reset to a previous commit (cautiondata loss).</li>
119
-
</ul>
120
-
<code>git rm [file]</code>
121
-
<ul>
122
-
<li>Removes a file from the working directory and stages the removal for the next commit.</li>
123
-
</ul>
124
-
<code>git diff</code>
125
-
<ul>
126
-
<li>Shows the differences between the working directory and the last committed version.</li>
127
-
</ul>
128
-
<code>git tag [tag name]</code>
129
-
<ul>
130
-
<li>Creates a tag (a named pointer to a specific commit) for easy reference to important commits.</li>
131
-
</ul>
132
-
<code>git stash</code>
133
-
<ul>
134
-
<li>Temporarily saves changes that aren't ready for commit, allowing you to switch branches or perform other tasks.</li>
135
-
</ul>
136
-
<code>git push origin --tags</code>
137
-
<ul>
138
-
<li>Pushes tags to the remote repository, sharing important points in the project's history.</li>
139
-
</ul>
140
-
</div>
141
-
</div>
142
-
<!-- Footer -->
143
-
<divclass="footer">
144
-
<p>Brought to you by SCE Dev-Team - Cloned by brendan-ly</p>
145
-
</div>
146
-
<script>
147
-
document.getElementById("defaultTab").click();
148
-
</script>
149
-
</div>
150
-
</body>
151
-
</html>
3
+
4
+
<head>
5
+
<metacharset="UTF-8" />
6
+
<title>COOL RECIPES</title>
7
+
</head>
8
+
9
+
<body>
10
+
<h1>Recipes that have a special place in my heart</h1>
11
+
<ul>
12
+
<li>
13
+
<ahref="recipe/egg.html">Egg city, I am the mayor</a>
0 commit comments