ayunas/git-demonstration

git flow example at TEKcamp

Git

• In this exercise, you will understand how to use Git and GitHub, as well as learn the general git work flow @ TEKcamp.

Exercise Pre-reqs :

1. Download Git and install on your machine
2. Create a GitHub account

********************************************************

Exercise Instructions

• Copy the html file from the prework (Markup Exercise) and paste it in the new cloned folder. (e.g. index.html)
• Create a new file using the command line called notes.txt
• Add some text to the notes.txt file.
• Create a new branch called html-branch
• Move the html file to the html-branch and leave the notes.txt file in the master branch
• Add three <p> tags with "lorem ipsum" paragraph text to the html file, which should now be on the html-branch. You can find "lorem ipsum" at the following link : https://loremipsum.io/
• Save your changes, then add, commit and push your files up to the html-branch repository on github. Make sure you add a descriptive message for your commit.
• Refresh your repository to make sure your file was uploaded and the html-branch was updated.
• Create another branch called text-branch
• Move the notes.txt from master to the text-branch. The master branch should now be completely empty at this point, aside from the README file and the data.json file.
• Check the status, add, commit and push your changes to the text-branch. Make sure you add a descriptive message for your commit.
• Add 3 additional lorem-ipsum paragraphs into the notes.txt file which should now be on the text-branch.
• Commit and push your additional changes to the text-branch on GitHub. Make sure you add a descriptive message for your commit.
• On GitHub, verify that the master branch only has the README.md and the data.json file with nothing else. Verify that the html-branch and the text-branch each have a respective .html and .txt file. Submit a pull request for both the html-branch and the text-branch to be merged into master. Add your TA as a collaborator for both Pull Requests (PR).

********************************************************

Optional:

(not graded, but made available for your development as a developer. ⛰)

• The instructions for the optional exercise is on another branch of this repo. Find those instructions.

********************************************************

Git Instructions

• Create a template copy of this repository by clicking : "Use this template"
• Name the repository the same name as the master template repository.
• Add your TM as collaborator
• Clone YOUR repo to your local computer
• Create a new branch: git checkout -b <firstName-lastName>.
• Implement the project on your newly created <firstName-lastName> branch, committing changes regularly.
• Push all of your commits: git push origin <firstName-lastName>.
• When ready for your TM to review, open a Pull Request (PR) and add your TM as a collaborator.