Open Source Comes to Campus/Curriculum/Git/Students: Difference between revisions
Content added Content deleted
imported>Shauna No edit summary |
imported>Shauna No edit summary |
||
| Line 90: | Line 90: | ||
This is a special trick that we do during the Website editing with git exercise, using Github Pages. It demonstrates that when the merge happens, it can programmatically cause a different event; this is often called ''hooks''. |
This is a special trick that we do during the Website editing with git exercise, using Github Pages. It demonstrates that when the merge happens, it can programmatically cause a different event; this is often called ''hooks''. |
||
== Optional: Merge Conflicts == |
|||
(This section is in progress.) |
|||
If you're finished with the above and eager to learn more, you can also explore the world of merge conflicts. A merge conflict happens when two different commits change the same part of a file. |
|||
For instance, let's say |
|||