Anonymous user
Open Source Comes to Campus/Curriculum/Git/Students: Difference between revisions
Open Source Comes to Campus/Curriculum/Git/Students (view source)
Revision as of 23:33, 22 November 2013
, 10 years agono edit summary
imported>Shauna |
imported>Shauna No edit summary |
||
Line 27:
* Open a terminal and type: <code>"git clone "</code> (including the spaces, but not including the quotation marks)
* Use your terminal to "paste" the URL in. (Make sure it starts with <code>https</code>; if not, you'll need to use an ssh key and
* Press enter to do the "<code>git clone</code>" operation.
Line 132:
=== Resolving Merge Conflicts ===
Your instructor should have showed you what she sees when you submit a pull request. Probably you saw a message from Github saying that the pull request could be "merged automatically". That means that you managed to avoid changing a part of the project that someone else also changed. Yay! That's how we designed this activity. But what happens if you
Let's say you and a friend both got up-to-date copies of the repository, at the same time. You both decide to edit the page's title, which currently says, 'Practicing Git at Princetown'. You both decide to fix the spelling of Princeton. You're really excited, though, so you change it to 'Practicing Git at Princeton!' Your friend, meanwhile, is confused. She changes it to 'Practicing Git at Princeton????'
| |||