Skip to content

Commit 55b3caf

Browse files
authored
Account for if the contributor changed the name of the fork
1 parent 8bfe0e0 commit 55b3caf

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

_docs/developer/getting_started/commit_to_PR_from_fork.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,52 @@ The instructions below are for command line use of git.
2222

2323

2424
1. First, from the PR on the Github website, find the name of the
25-
fork + branch name. It should be formatted something like this:
25+
user + branch name. It should be formatted something like this:
2626
```
2727
contributorusername:contributor_branch_name
2828
```
2929
30+
Additionally, find the name of the fork
31+
on the fork's page on Github.
32+
3033
31-
2. Next, make a local branch on your computer in your working repository
32-
with the proposed code changes. Here are the command lines
33-
(substitute the fork & branch name we found above):
34+
3. Next, make a local branch on your computer in your working repository
35+
with the proposed code changes. Here are the command lines
36+
(substitute the user, branch, and fork names we found above):
3437
3538
If you **are not** using ssh keys on git:
3639
```
3740
git checkout -b contributorusername-contributor_branch_name main
38-
git pull https://github.com/contributorusername/Submitty.git contributor_branch_name
41+
git pull https://github.com/contributorusername/fork_name.git contributor_branch_name
3942
```
4043
4144
If you **are** using ssh keys on git:
4245
```
4346
git checkout -b contributorusername-contributor_branch_name main
44-
git pull [email protected]:contributorusername/Submitty.git contributor_branch_name
47+
git pull [email protected]:contributorusername/fork_name.git contributor_branch_name
4548
```
4649
4750
48-
3. This has made a local branch named
51+
4. This has made a local branch named
4952
`contributorusername-contributor_branch_name`. Go ahead and test
5053
and review the PR and make code edits and new commits to your
5154
local branch as needed.
5255
5356
5457
55-
4. In order to push the changes to the contributor's fork (and the PR
58+
5. In order to push the changes to the contributor's fork (and the PR
5659
on Github from the fork), you will specify the upstream to be the
5760
contributor's fork:
5861
5962
If you **are not** using ssh keys on git:
6063
```
61-
git remote add upstream https://github.com/contributorusername/Submitty.git
64+
git remote add upstream https://github.com/contributorusername/fork_name.git
6265
```
6366
6467
6568
If you **are** using ssh keys on git:
6669
```
67-
git remote add upstream [email protected]:contributorusername/Submitty.git
70+
git remote add upstream [email protected]:contributorusername/fork_name.git
6871
```
6972
7073
@@ -77,20 +80,20 @@ The instructions below are for command line use of git.
7780
```
7881
origin https://github.com/Submitty/Submitty.git (fetch)
7982
origin https://github.com/Submitty/Submitty.git (push)
80-
upstream https://github.com/contributorusername/Submitty.git (fetch)
81-
upstream https://github.com/contributorusername/Submitty.git (push)
83+
upstream https://github.com/contributorusername/fork_name.git (fetch)
84+
upstream https://github.com/contributorusername/fork_name.git (push)
8285
```
8386
8487
Or this if you **are** using ssh keys on git:
8588
```
8689
origin [email protected]:Submitty/Submitty.git (fetch)
8790
origin [email protected]:Submitty/Submitty.git (push)
88-
upstream [email protected]:contributorusername/Submitty.git (fetch)
89-
upstream [email protected]:contributorusername/Submitty.git (push)
91+
upstream [email protected]:contributorusername/fork_name.git (fetch)
92+
upstream [email protected]:contributorusername/fork_name.git (push)
9093
```
9194
9295
93-
5. Now once you are finished with your code changes, first commit them to
96+
6. Now once you are finished with your code changes, first commit them to
9497
the local branch (named
9598
`contributorusername-contributor_branch_name`).
9699
@@ -103,7 +106,7 @@ The instructions below are for command line use of git.
103106
*NOTE: If you encounter a permissions error, it is possible that the external
104107
contributor didn't grant access for collaboration on the branch.*
105108
106-
6. Confirm that you can see the changes on the Github website for the PR.
109+
7. Confirm that you can see the changes on the Github website for the PR.
107110
108111
109112
---

0 commit comments

Comments
 (0)