search

princeton-5 / princeton-5.github.io

Other
0 stars 2 forks source link

Correct image of Princeton #9

Open andrewctran opened 10 years ago

andrewctran commented 10 years ago

Correct image of Princeton

shaunagm commented 10 years ago

Hi @andrewctran! I love the new image, but I can't merge this request - yet. If you look at the diffs created by your pull request (https://github.com/princeton-5/princeton-5.github.io/pull/9/files) you can see that a number of other lines were altered, and that caused a merge conflict.

To fix this, you have two choices. You can get rid of the extra changes (they mostly seem to be whitespace deletions) and resubmit the pull request, or you can resolve the merge conflict yourself. I encourage you to do the latter - it's a useful skill to learn! You can read some instructions here (https://openhatch.org/wiki/Open_Source_Comes_to_Campus/Practicing_Git/Students#Resolving_Merge_Conflicts) and/or you can come join us on IRC and get some guidance there (http://openhatch.readthedocs.org/en/latest/community/contact.html).