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 03:29, 18 April 2015
, 9 years ago→Resolving Merge Conflicts
imported>Justinfmorgan |
|||
| (7 intermediate revisions by 2 users not shown) | |||
Line 1:
__NOTOC__
== Make sure you have git set up ==
This can be done by typing the following into your console:
Line 14 ⟶ 15:
But note that any changes in your ''fork'' (your personal copy of the repo) won't show up there until the maintainer of the project merges those changes in.
== Find a task ==▼
Now, find a bug on the project's issue tracker that you will work on, and claim it by leaving a comment on the issue saying so.▼
(Before you do that, make sure to refresh the page and check that no one else has claimed it while you were reading and deciding.)▼
== To fork a project on Github ==
Line 29 ⟶ 36:
== Now, clone to it to your computer ==
* On the right side, look for the clone URL directly under the settings button.
* Copy that to the clipboard
* Open a terminal
* Once you're at the direction, type into the terminal: <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 most students probably won't a key already set up)▼
▲* 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 most students probably won't have a key already set up)
* Terminal should now look something like this:
git clone https://github.com/<rest of clone url>
* Press enter to do the "<code>git clone</code>" operation.
Line 50 ⟶ 63:
* Undo that change, with your editor, save, and then reload in the browser. Make sure what you see in the browser reflects that change.
▲== Find a task ==
▲Now, find a bug on the project's issue tracker that you will work on, and claim it by leaving a comment on the issue saying so.
▲(Before you do that, make sure to refresh the page and check that no one else has claimed it while you were reading and deciding.)
== Resolve the task ==
Line 180 ⟶ 187:
To resolve the conflict, scroll through the document until you find sections with these markings. The "========" line separates the two options that are in conflict. Choose which one you want to keep by deleting the other. Then delete all of the markings. Do this for each conflict and then save and exit the file.
Congrats! You've resolved the conflict! You can commit your changes
</div>
| |||