Permalink
Browse files

Move D3 lab to after workflow discussion

We tried this on the last delivery and it really made the D3 lab more
useful and meaningful to developers. Also added a line suggesting that
they replicate the team project workflow in this simulation.

Close #45. Partially address (or maybe close?) #39.
  • Loading branch information...
caleb-pearce committed Nov 30, 2017
1 parent 36cc6f8 commit 3fcba091aff81cb80b0c58959d9ab7e35e4aafd5
Showing with 12 additions and 11 deletions.
  1. +12 −11 README.md
@@ -94,17 +94,6 @@ However, as long as you're only rebasing your own code on top of things,
`git rebase` is perfectly safe, and if `master` happens to change a lot,
it's a great way of making sure that `feature` stays up to date. _Remember: when you "rebase your code on top of things" the branch following `git rebase` is what you're rebasing your branch "on top of" — it will be the new "base" for your current branch if executed._

### Lab: Identify the differences between rebase and merge.
- Open [Explain Git with D3](https://onlywei.github.io/explain-git-with-d3/) in your browser.
- This is a very simple git model, and it assumes that every commit already has
changes that have been added and saved. Using the `git checkout`, `git commit` (every git commit will generate and place a new commit on the current branch), `git merge`, and `git rebase` commands, and the provided examples for merging and rebasing, run
the commands for both rebasing and merging and take note of the differences you find.
- Pay special attention to the following:
- In plain English, what does `git merge` do to our history?
- In plain English, what does `git rebase` do to our history?

_Take five minutes to run through these exercises and discuss insights among your squads._


### What's in a rebase, really?

@@ -239,6 +228,18 @@ Work through the following steps as a team.

- **Never _ever_** rebase code that's been published.

### Lab: Identify the differences between rebase and merge.
- Open [Explain Git with D3](https://onlywei.github.io/explain-git-with-d3/) in your browser.
- This is a very simple git model, and it assumes that every commit already has
changes that have been added and saved. Using the `git checkout`, `git commit` (every git commit will generate and place a new commit on the current branch), `git merge`, and `git rebase` commands, and the provided examples for merging and rebasing, run
the commands for both rebasing and merging and take note of the differences you find.
- Try replicating the workflow we've laid out for you above.
- Pay special attention to the following:
- In plain English, what does `git merge` do to our history?
- In plain English, what does `git rebase` do to our history?

_Take five minutes to run through these exercises and discuss insights among your squads._

### Lab: Using the GA Team Project Workflow

To practice the workflow we've prescribed for you,

0 comments on commit 3fcba09

Please sign in to comment.