GitHub - nashville-software-school/git-example---random-character: a simple git example of a page that creates a random fantasy character, with instructions to demonstrate git workflow

nashville-software-school / git-example---random-character Public

Notifications You must be signed in to change notification settings
Fork 0
Star 0

a simple git example of a page that creates a random fantasy character, with instructions to demonstrate git workflow

Notifications

Name		Name	Last commit message	Last commit date
Latest commit History 2 Commits
index.html		index.html
readme.txt		readme.txt
script.js		script.js
styles.css		styles.css

Repository files navigation

1. create git repo
2. create HTML, referencing styles and script. add those files
3. commit and push. then another dev can add styles in a separate branch while...
4. first dev adds script in a new branch. set an array of character classes, log a random one
5. after committing, then merging both of those branches dev 2 can add character races in a new branch.
6. both developers want to add an extra class to the end of the array. and one removes a race.
7. PR for each of these branches. conflict on second one. pull down and resolve locally, then PR again.