diff --git a/images/early_pr_message.png b/images/early_pr_message.png new file mode 100644 index 0000000..481cb89 Binary files /dev/null and b/images/early_pr_message.png differ diff --git a/images/github_branch_list.png b/images/github_branch_list.png new file mode 100644 index 0000000..72c896c Binary files /dev/null and b/images/github_branch_list.png differ diff --git a/images/master_merge.png b/images/master_merge.png new file mode 100644 index 0000000..109536f Binary files /dev/null and b/images/master_merge.png differ diff --git a/images/more_discussion.png b/images/more_discussion.png new file mode 100644 index 0000000..2057137 Binary files /dev/null and b/images/more_discussion.png differ diff --git a/images/our_campfire_logs.png b/images/our_campfire_logs.png new file mode 100644 index 0000000..f63a3ec Binary files /dev/null and b/images/our_campfire_logs.png differ diff --git a/images/shipit.png b/images/shipit.png new file mode 100644 index 0000000..a58a47f Binary files /dev/null and b/images/shipit.png differ diff --git a/images/shipit_comment.png b/images/shipit_comment.png new file mode 100644 index 0000000..b2a05c2 Binary files /dev/null and b/images/shipit_comment.png differ diff --git a/index.html b/index.html index a8431f4..0696611 100644 --- a/index.html +++ b/index.html @@ -82,7 +82,7 @@
This is nice because when we go to the GitHub branch list page we can easily see what branches have been worked on recently and roughly how much work they have on them.
-

It's almost like a list of upcoming features with current rough status. This page is awesome if you're not using it - it only shows you branches that have unique work on them relative to your currently selected branch and it sorts them so that the ones most recently worked on are at the top. If I get really curious, I can click on the 'Compare' button to see what the actual unified diff and commit list is that is unique to that branch.
@@ -124,11 +124,11 @@Actually, we use it more as a branch conversation view more than a pull request. You can send pull requests from one branch to another in a single project (public or private) in GitHub, so you can use them to say "I need help or review on this" in addition to "Please merge this in".
-

Here you can see Josh cc'ing Brian for review and Brian coming in with some advice on one of the lines of code. Further down we can see Josh acknowledging Brian's concerns and pushing more code to address them.
-

Finally you can see that we're still in the trial phase - this is not a deployment ready branch yet, we use the Pull Requests to review the code long before we actually want to merge it into master for deployment.
If the branch has been open for too long and you feel it's getting out of sync with the master branch, you can merge master into your topic branch and keep going. You can easily see in the pull request discussion or commit list when the branch was last brought up to date with the 'master'.
-
p>
When everything is really and truly done on the branch and you feel it's ready to deploy, you can move on to the next step.
We don't simply do work directly on master or work on a topic branch and merge it in when we think it's done - we try to get signoff from someone else in the company. This is generally a +1 or emoji or "
" comment, but we try to get someone else to look at it.
We don't simply do work directly on master or work on a topic branch and merge it in when we think it's done - we try to get signoff from someone else in the company. This is generally a +1 or emoji or "
" comment, but we try to get someone else to look at it.


Once we get that, and the branch passes CI, we can merge it into master for deployment, which will automatically close the Pull Request when we push it.
@@ -164,7 +164,7 @@will deploy the code and zero-downtime restart all the necessary processes. You can see how common this is at GitHub:
-

You can see 6 different people (including a support guy and a designer) deploying about 24 times in one day.