Anonymous user
Open Source Comes to Campus/Curriculum/Directory: Difference between revisions
Open Source Comes to Campus/Curriculum/Directory (view source)
Revision as of 03:43, 9 March 2014
, 10 years agono edit summary
imported>Shauna No edit summary |
imported>Shauna No edit summary |
||
Line 161:
That's it! You can add as many remotes as you'd like, although for the most part people stick to one or two.
You want to get the most up to date version of directory.html from the original repository. To get an updated version of the main repository, you can type:
Line 174:
There are two ways to do this. We'll go over both.
There are a number of tools you can use to help visualize merge conflicts. For simple conflicts, though, I like to use a basic editor, such as nano, vim, emacs, or whatever you're most comfortable with. In basic text view, a merge conflict looks like this:
Line 184:
You will then need to [[Open_Source_Comes_to_Campus/Curriculum/Directory#Commit_and_push | add and commit]] your changes.
Dealing with merge conflicts can get messy, especially when there are a lot of changes and you want to keep things from both versions of the file.
|