This repository is for showing how Git and GitHub work.
This starter web repo is structure to show how various git commands work and standard git workflow. A number of changes are made to this file with some commit and some push and finally a non-commit change is made to demonstrate the most basic diff and merge tool usage.
Sample website with plenty of files for demos to show how it all work. However, real life situation could be different due to the fact that files could be changed by other tools and not by the user.
You can contribute by following the iinstructor's instructions and provding feedbacks.
The following tools are also used in this demonstration:
- TextMate
- P4Merge
Both tools have been incorporated into git via the .gitconfig file.