git-haiku.md

Git Haiku

15 min

Haiku - A Japanese poem of seventeen syllables, in three lines of five, seven, and five, traditionally evoking images of the natural world.

An old silent pond...
A frog jumps into the pond,
splash! Silence again.

Basho Matsuo

[line one]

[line two]

[line three]

Web Development Immersive

1. Fork this repository and clone the newly forked repo to your computer
2. Connect the original repo as remote upstream with git remote add upstream [remote_url]
3. Create a branch named line_one and switch to it with git checkout -b line_one
4. Replace the placeholder [line one] in this README with a line you want to use
5. Add and commit the changes
6. Push the branch line_one to your forked repository with git push origin line_one
7. Go back to the original repo on GitHub and click on the New pull request button
8. Set the branch to compare to line_one and leave a description of the work performed
9. [Instructor] Choose a pull request to merge into the master branch
10. Pull down the latest approved changes from upstream with git pull upstream master
11. If there's a merge conflict, resolve it
12. Repeat steps 3-10 to submit changes for line_two and line_three