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
Copy file name to clipboardExpand all lines: content/6-github-flow.md
+22-22Lines changed: 22 additions & 22 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -6,11 +6,11 @@
6
6
The [GitHub flow][github-flow] is a lightweight, [branch-based][about-branches] workflow. It's designed to allow for free testing and exploration of ideas and novel approaches which are then reviewed and, if accepted, brought into the codebase. At a high level, the GitHub flow follows this pattern:
7
7
8
8
1. Create a branch
9
-
1. Make the desired changes
10
-
1. Create a [pull request][about-prs]
11
-
1. Review changes, gather feedback and make updates
12
-
1. Review results of automated operations such as testing for continuous integration
13
-
1. If changes are approved, merge into codebase
9
+
2. Make the desired changes
10
+
3. Create a [pull request][about-prs]
11
+
4. Review changes, gather feedback and make updates
12
+
5. Review results of automated operations such as testing for continuous integration
13
+
6. If changes are approved, merge into codebase
14
14
15
15
The GitHub flow is designed to work as a cycle, where contributors continuously explore, test, review, and build upon their work and the work of others.
16
16
@@ -19,7 +19,7 @@ The GitHub flow is designed to work as a cycle, where contributors continuously
19
19
20
20
## Scenario
21
21
22
-
With the code changes created in the [prior exercise][code-exercise], it's time to walk through the GitHub flow to create a pull request and incorporate the updates into the codebase. While the changes have already been made (meaning we are slightly out of order from the "traditional" flow), you can still perform the steps to explore.
22
+
With the code changes created in the [prior exercise][walkthrough-previous], it's time to walk through the GitHub flow to create a pull request and incorporate the updates into the codebase. While the changes have already been made (meaning we are slightly out of order from the "traditional" flow), you can still perform the steps to explore.
23
23
24
24
## Creating a branch
25
25
@@ -28,11 +28,11 @@ A [branch][about-branches] is a copy of the code stored in the same repository.
28
28
There are different ways to create a branch when using [GitHub Codespaces][github-codespaces]. You can utilize the command-line to run [git](https://git-scm.com/docs/git-branch) commands. You can use the Source Control pane in your codespace to get the support of the UI for creating your branch. In our example we're going to use the command-line to create the branch.
29
29
30
30
1. Return to your codespace, or reopen it by navigating to your repository and selecting **Code** > **Codespaces** and the name of your codespace.
31
-
2. Open a **terminal window** by pressing <kbd>Ctl</kbd> + <kbd>`</kbd>.
32
-
3. In the terminal window, enter the following command to create and switch to a new branch named `add-filter`:
31
+
2. Open a **terminal window** by pressing <kbd>Ctl</kbd> + <kbd>\`</kbd>.
32
+
3. In the terminal window, enter the following command to create and switch to a new branch named `add-flag`:
33
33
34
34
```bash
35
-
git checkout -b add-filter
35
+
git checkout -b add-flag
36
36
```
37
37
38
38
4. Stage all code to be committed to the new branch by entering the following commandin the terminal window:
@@ -49,7 +49,7 @@ There are different ways to create a branch when using [GitHub Codespaces][githu
49
49
7. Finally, push the new branch to the repository by entering the following commandin the terminal window:
50
50
51
51
```bash
52
-
git push -u origin add-filter
52
+
git push -u origin add-flag
53
53
```
54
54
55
55
## Create the pull request to suggest updates
@@ -59,16 +59,16 @@ A [pull request][about-prs] is a request to pull or incorporate new code into th
59
59
Pull requests can be made through the source control pane in the codespace, the repository's website, or through the command-line using the [GitHub CLI][github-cli]. In our example we're going to create the pull request in the CLI, then navigate to the website to see the pull request and the actions running, and merge the code into the codebase.
60
60
61
61
1. Return to your codespace.
62
-
1. Find the number forthe [issue you created earlier][issues-exercise] titled **Add component to display hours** by entering the following commandin the terminal window:
62
+
2. Find the number forthe [issue you created earlier][issues-exercise] titled **Add component to display hours** by entering the following commandin the terminal window:
63
63
64
64
```bash
65
65
gh issue list
66
66
```
67
67
68
-
1. Create a pull request with the title **Add hours component** and body **Resolves #\<ISSUE_NUMBER\>**, replacing **\<ISSUE_NUMBER\>** with the issue number you obtained in the previous step by entering the following command in the terminal window:
68
+
3. Create a pull request with the title **Add adoption status flag** and body **Resolves #\<ISSUE_NUMBER\>**, replacing **\<ISSUE_NUMBER\>** with the issue number you obtained in the previous step by entering the following command in the terminal window:
0 commit comments