Skip to content

Commit

Permalink
Link to youtube video about issues drphilmarshall#10
Browse files Browse the repository at this point in the history
  • Loading branch information
drphilmarshall committed Sep 25, 2015
1 parent 4fa7bc6 commit 4b755e4
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ As you might have guessed, git pull is actually a shortcut to two commands one a

Your name should be written on your "profile" page, which you can reach by going to the [GitHub home
page](https://github.com/) and clicking on the little icon in the very top right hand corner of the page. It's a
good idea to enter your full name (and preferably some other public details about yourself) so that people can
good idea to enter your full name (and preferably some other public details about yourself) so that people can
find you and communicate with you on GitHub.

You are here because `git` and GitHub are incredibly useful research tools, that are well worth your time learning.
Expand Down Expand Up @@ -317,12 +317,12 @@ To see all the remotes that you have access to, type 'git remote -v'.
----------------------------------------------------------------------
#### <a name="conflicts"></a>I git pulled and now I have a conflict. What do I do?

Fix it. The error message tells you which files contain the conflict.
Open them in an editor and search for the string
'&gt;&gt;&gt;&gt;&gt;&gt;'. Just like in svn, the portion of code
between this string and the '======' mark is the remote version, while
the portion below it and above the '&lt;&lt;&lt;&lt;&lt;&lt;' string is
your local version. Edit the file so it is correct. Then, to resolve the
Fix it. The error message tells you which files contain the conflict.
Open them in an editor and search for the string
'&gt;&gt;&gt;&gt;&gt;&gt;'. Just like in svn, the portion of code
between this string and the '======' mark is the remote version, while
the portion below it and above the '&lt;&lt;&lt;&lt;&lt;&lt;' string is
your local version. Edit the file so it is correct. Then, to resolve the
conflict in &lt;filename&gt;you 'git add &lt;filename&gt;' before you then `git commit` to save your changes.


Expand Down Expand Up @@ -370,6 +370,8 @@ You can give GitHub your public SSH key instead. See the instructions [above](#c
----------------------------------------------------------------------
#### <a name="issuing"></a>What is a GitHub "issue"?

To watch the video, [click here](https://www.youtube.com/watch?v=2g9lsbJBPEs#)

This comment has been minimized.

Copy link
@TestingPhil123

TestingPhil123 Sep 25, 2015

Owner

This link is missing the time stamp...


When coding, many issues arise that need to be addressed: bugs, new features that you want, questions you have about the documentation and so on. When you have identified an issue, you usually want to do two things: 1) make a note of it so you can deal with it later and 2) tell your collaborators about it. GitHub issues do both.

To start a new issue, go to the circle with an exclamation point inside it in the repo's right hand sidebar (right under "code" and above "Pull requests").  Then, hit the big green "New issue" button, give it a title (like the subject line of an email, summarizing the issue) and if necessary, a short description of what needs to be done - and when you hit submit, the issue is added to the repo's list, and a notification email is sent to everyone who is "watching" the repo. This is a Good Thing: you want to be able to keep up with your projects!
Expand Down

0 comments on commit 4b755e4

Please sign in to comment.