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: README.md
+7-7
Original file line number
Diff line number
Diff line change
@@ -14,15 +14,15 @@ To reiterate this repository is to get people (you!) comfortable with using GitH
14
14
* Move to main directory `cd github-playground`
15
15
* Check your status `git status` Should see "On Branch Master" "Your branch is up-to-date with 'origin/master'"
16
16
* Create and checkout a branch to work from: `git checkout -b <branch_name>` EX: `git checkout -b training-branch` You can see all branches by typing `git branch`. Note: we are using training-branch in this example but by the time you follow these instructions someone may have already created `training-branch` you should create a unique branch.
17
-
* Read about git [branching and merging](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
17
+
* Read about git [branching and merging](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging).
18
18
* Make a change to an existing file or create a new file and save. `EX: echo "print("hello")" > hello.py`
19
19
* Check status of your change with `git status`. Your file should show up under "Untracked Files" EX: `hello.py` or whatever file you created.
20
20
* Add file to changes `git add <filename>` or `git add .` (adds all untracked files -- CAREFUL use with caution) EX: `git add hello.py`
21
-
* See exactly what [changes](https://git-scm.com/docs/git-diff) are staged `git diff --cached` (or `git diff` if files are not yet staged)
21
+
* See exactly what [changes](https://git-scm.com/docs/git-diff) are staged `git diff --cached` (or `git diff` if files are not yet staged).
22
22
* Commit your changes `git commit -m "Hey this is my first commit"`[Read](http://chris.beams.io/posts/git-commit/) about how to write good commit messages.
23
23
* Check your [remote](https://help.github.com/articles/adding-a-remote/)`git remote -v` (if you started by cloning a repo from GitHub origin should already be set)
24
-
*[Push](https://help.github.com/articles/pushing-to-a-remote/) your changes to the remote server by typing `git push <remote-name> <your-branch>` EX `git push origin training-branch`
25
-
* Open the repo in GitHub and select your [branch](https://help.github.com/articles/viewing-branches-in-your-repository/)
24
+
*[Push](https://help.github.com/articles/pushing-to-a-remote/) your changes to the remote server by typing `git push <remote-name> <your-branch>` EX:`git push origin training-branch`
25
+
* Open the repo in GitHub and select your [branch](https://help.github.com/articles/viewing-branches-in-your-repository/).
26
26
* You should see [compare and pull request](https://help.github.com/articles/about-pull-requests/). This will bring up a summary of your changes and show you what branch you are merging.
27
27
* Edit your message and click submit. Now you should see your pull request show up in the pull requests tab!
28
28
* In a real project your PR may be discussed and reviewed. Stakeholders may suggest changes or updates and (hopefully) eventually your code will be merged!
@@ -51,12 +51,12 @@ This only scratches the surface of what is possible with git and GitHub. Feel fr
51
51
* Make sure your branch is up to date before you start working.
52
52
* Give branches appropriate names, e.g. `fix/238` (where 238 is the issue number) or `original-branch/my-feature`.
53
53
* Make each PR as concise as possible. Don’t rewrite large sections of the codebase to fit a tiny contribution. Make a separate issue or PR for any extra modifications that need to be made.
54
-
* Don't merge new commits from `master` to your branches: wait till the final merge into `master` (or rebase your branches to `master`)
54
+
* Don't merge new commits from `master` to your branches: wait till the final merge into `master` (or rebase your branches to `master`).
55
55
* Don't be scared and ask for help. Most of us have learned this "on the job".
56
56
57
57
#### Additional resources
58
58
* Try GitHub [desktop](https://desktop.github.com/) client if you prefer to work with GUI
*[Learn Version Control with Tower](https://www.git-tower.com/learn/git/videos/) (videos)
@@ -66,5 +66,5 @@ This only scratches the surface of what is possible with git and GitHub. Feel fr
66
66
* Do not worry, we have all been there!
67
67
* Join [#github-help](https://datafordemocracy.slack.com/messages/github-help/) channel on Slack and ask for help.
68
68
* DM someone directly. Below users have volunteered to assist with GitHub questions:
69
-
*@mattgawarecki, @bstarling, @john
69
+
*@mattgawarecki, @bstarling, @john
70
70
* Was something not clear or was there an area you struggled with? Submit a [Pull request](https://help.github.com/articles/about-pull-requests/) (PR) or open an [issue](https://help.github.com/articles/creating-an-issue/) to help us improve!
0 commit comments