Skip to content

Commit c0fcc10

Browse files
committed
augment fork/pr instructions
1 parent 8edf53b commit c0fcc10

File tree

2 files changed

+37
-42
lines changed

2 files changed

+37
-42
lines changed

handson_branch.Rmd

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,32 +93,44 @@ git revert HEAD
9393
```
9494

9595
- This pushes you into a unix text editor. The full explanation is tedious. Just type `Esc`, then `:wq` then `Enter`
96-
- **NOTE:** A full explanation of [git revert](https://git-scm.com/docs/git-revert) and [git reset](https://git-scm.com/docs/git-reset) will take considerably more time. If you find you do this a lot, investigate these commands fully.
97-
98-
- **HINT:** For small changes, many people find a far simpler method is as follows...
99-
100-
1. At GitHub, click the "Commits" link
101-
1. Isolate the verion you need by clicking the `< >` link. This enables you to browse the repository at that point in history
102-
1. Navigate to the fine you need. Copy the file.
103-
1. Back in your editor, paste over the source version.
104-
Commit & Push
10596

10697
17. Commit and Push.
10798
1. Observe the visual representations of the version history
10899

100+
101+
#### NOTE
102+
103+
A full explanation of [git revert](https://git-scm.com/docs/git-revert) and [git reset](https://git-scm.com/docs/git-reset) will take considerably more time. If you find you do this a lot, investigate these commands fully.
104+
105+
#### HINT
106+
107+
For small changes, many people find a far simpler method is as follows...
108+
109+
1. At GitHub, click the "Commits" link
110+
1. Isolate the verion you need by clicking the `< >` link. This enables you to browse the repository at that point in history
111+
1. Navigate to the fine you need. Copy the file.
112+
1. Back in your editor, paste over the source version.
113+
Commit & Push
114+
115+
116+
## Roll back
117+
118+
The above example is a trivial example of how to employ rolling back to a previous version. Rolling back is complicated. Depending on the complexity of your project, it may be more crtical to leverage git commands during a roll-back. Software applications may be an example of this complexity. However, for simpler roll-backs, the simple explanations below may save you a lot of time for an operation which you would otherwise rarely perform.
119+
120+
### File
121+
122+
Sometimes the easiest thing to do is grab the file (or subtext from a file) in a previous commit that is already displayed on GitHub. To do so.
123+
124+
1. Find your repository on GitHub
125+
1. Click the "commits" tab
126+
1. Click the SHA link for the commit which has the most recent working version
127+
1. Click the filename representing the working file you want
128+
1. Click View; Raw
129+
1. Copy what you want and over-write your local repository with the previously working version
130+
131+
### Repository
132+
133+
<figure>![](https://imgs.xkcd.com/comics/git.png)<figcaption>KXCD. Git: https://xkcd.com/1597/</figcaption></figure><br>
134+
109135

110-
<!-- Notes for Next Section -->
111-
<!-- Should cover collaboration
112-
- Simplicity of the Roll-back on Social Coding sites (look at a previous version, copy/paste)
113-
- XKCD: sync-up ; If errors: save work elseswhere, delete and download a fresh copy.
114-
- pull requests
115-
- revert
116-
- reset
117-
- remotes
118-
- triggers / Webhooks
119-
- add collaborators
120-
- Organizational Accounts
121-
- wiki
122-
- issues
123-
and collaboration -->
124136

handson_pr.Rmd

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,6 @@ This document follows set-up from the [first hands-on](handson.html)
99

1010
This section introduces a variety of topics: fork, pull requests, collaborators, wikis on GitHub, Issues on GitHub, and git remotes.
1111

12-
## Roll back
13-
14-
## File
15-
16-
Sometimes the easiest thing to do is grab the file (or subtext from a file) in a previous commit that is already displayed on GitHub. To do so.
17-
18-
1. Find your repository on GitHub
19-
1. Click the "commits" tab
20-
1. Click the SHA link for the commit which has the most recent working version
21-
1. Click the filename representing the working file you want
22-
1. Click View; Raw
23-
1. Copy what you want and over-write your local repository with the previously working version
24-
25-
## Repository
26-
27-
<figure>![](https://imgs.xkcd.com/comics/git.png)<figcaption>KXCD. Git: https://xkcd.com/1597/</figcaption></figure><br>
28-
2912

3013
## Collaborating
3114

@@ -39,8 +22,8 @@ If you intend to submit modifications to some other repository by issuing a Pull
3922

4023
https://github.com/data-and-visualization/pr_hello-world
4124

42-
1. [Source] Fork this repository
43-
1. [Partner] Clone your forked copy of the repository
25+
1. [Source] Make a test repository and have your parter `fork` your repository
26+
1. [Partner] After you forked above, `clone` your forked repository
4427
1. [Partner] Make some changse to your cloned [forked] repository. (e.g. add a file, edit the readme, etc.)
4528
1. [Partner] Using the git commands you've already learned: add, commit, and push the changes
4629

0 commit comments

Comments
 (0)