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
| (One intermediate revision by one other user 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 56 ⟶ 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 186 ⟶ 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>
| |||