Closed jdonson closed 11 years ago
Three Repos For Nitesh:
The comment above is a framing of how to get started in the second repo: git-team-dev-dojo
By identifying all team dev github repo issues with local and remote dev on-boarding and addressing them here, we can learn to detect, resolve and prevent code conflicts by design in team dev workflows.
Lots of repo content needs to be moved to wiki pages.
We will use cacoo to diagram git conflicts.
CodePen and other sites are worth learning about.
Github uses this service for their training....
Just did the first course on codeschool, it was really helpful.
Git and GitHub Team Dev => See It, Do It, Teach It!
TEAM DEV INITIATION TASKS
Task 1: Register With Dev Team + Get Kitchen Set Up (OS, Browser, Skype, irc, github, cacoo, codepen)
Task 2: Clone to local and Null Commit to First-Null-Commit repo. Straight solo push.
Task 3: First problem: github origin repo is ahead of your local repo
Task 4: Second problem: same, but you wanted to undo your last prior commit
Task 5: Third problem: same, but you also just committed to local repo and have not yet pushed. Deadlock?
Task 6: Use diagrams to clarify the conflicts at play.
Task 7: Leverage GitHub Issues to organize tasks!
Task 8: Make this repo part of another repo: github-project-team-dev-onboarding
Task 9: Consider branches and merges to keep commits current and master pure.