backup/translations
1
0
Fork 0
mirror of https://github.com/oldratlee/translations.git synced 2026-04-14 18:49:55 +08:00
Code Issues Projects Releases Wiki Activity

update toc

Browse Source
This commit is contained in:
Jerry Lee
2018-06-22 23:24:24 +08:00
parent 3a06f2b336
commit 557181cdcc
17 changed files with 245 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
git-workflows-and-tutorials/README.md
View File

@@ -2,7 +2,7 @@
译文发在[博乐在线](http://www.jobbole.com/)： [http://blog.jobbole.com/76550/](http://blog.jobbole.com/76843/)，2014-09-14
PS：原文的老链接和标题是[Git Workflows and Tutorials](https://www.atlassian.com/git/workflows)，`atlassian`改地址后换了文章标题，译文保留使用原标题。
## 🍎 译序
## 🍎 译序
关于`Git`工作流主题，也许这是目前最全面最深入的说明。这篇指南以大家在`SVN`中已经广为熟悉使用的集中式工作流作为起点，循序渐进地演进到其它高效的分布式工作流，还介绍了如何配合使用便利的`Pull Request`功能，体系地讲解了各种工作流的应用。
如果你`Git`用的还不多，可以从前面的讲的工作流开始操练。操作过程去感受指南的讲解：解决什么问题、如何解决问题，这样理解就深了，也方便活用。
@@ -90,73 +90,74 @@ PS：原文的老链接和标题是[Git Workflows and Tutorials](https://www.atl
目录
-----------------
- [译序](#apple-译序)
- [概述](#git工作流指南)
- [🍎 译序](#-%E8%AF%91%E5%BA%8F)
- [概述](#-%E6%A6%82%E8%BF%B0)
- [集中式工作流](workflow-centralized.md)
- [工作方式](workflow-centralized.md#beer-工作方式)
- [冲突解决](workflow-centralized.md#冲突解决)
- [示例](workflow-centralized.md#beer-示例)
1. [有人先初始化好中央仓库](workflow-centralized.md#有人先初始化好中央仓库)
1. [所有人克隆中央仓库](workflow-centralized.md#所有人克隆中央仓库)
1. [小明开发功能](workflow-centralized.md#小明开发功能)
1. [小红开发功能](workflow-centralized.md#小红开发功能)
1. [小明发布功能](workflow-centralized.md#小明发布功能)
1. [小红试着发布功能](workflow-centralized.md#小红试着发布功能)
1. [小红在小明的提交之上`rebase`](workflow-centralized.md#小红在小明的提交之上rebase)
1. [小红解决合并冲突](workflow-centralized.md#小红解决合并冲突)
1. [小红成功发布功能](workflow-centralized.md#小红成功发布功能)
- [下一站](workflow-centralized.md#beer-下一站)
- [🍺 工作方式](workflow-centralized.md#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [冲突解决](workflow-centralized.md#%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3)
- [🍺 示例](workflow-centralized.md#-%E7%A4%BA%E4%BE%8B)
- [有人先初始化好中央仓库](workflow-centralized.md#%E6%9C%89%E4%BA%BA%E5%85%88%E5%88%9D%E5%A7%8B%E5%8C%96%E5%A5%BD%E4%B8%AD%E5%A4%AE%E4%BB%93%E5%BA%93)
- [所有人克隆中央仓库](workflow-centralized.md#%E6%89%80%E6%9C%89%E4%BA%BA%E5%85%8B%E9%9A%86%E4%B8%AD%E5%A4%AE%E4%BB%93%E5%BA%93)
- [小明开发功能](workflow-centralized.md#%E5%B0%8F%E6%98%8E%E5%BC%80%E5%8F%91%E5%8A%9F%E8%83%BD)
- [小红开发功能](workflow-centralized.md#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%8F%91%E5%8A%9F%E8%83%BD)
- [小明发布功能](workflow-centralized.md#%E5%B0%8F%E6%98%8E%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [小红试着发布功能](workflow-centralized.md#%E5%B0%8F%E7%BA%A2%E8%AF%95%E7%9D%80%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [小红在小明的提交之上`rebase`](workflow-centralized.md#%E5%B0%8F%E7%BA%A2%E5%9C%A8%E5%B0%8F%E6%98%8E%E7%9A%84%E6%8F%90%E4%BA%A4%E4%B9%8B%E4%B8%8Arebase)
- [小红解决合并冲突](workflow-centralized.md#%E5%B0%8F%E7%BA%A2%E8%A7%A3%E5%86%B3%E5%90%88%E5%B9%B6%E5%86%B2%E7%AA%81)
- [小红成功发布功能](workflow-centralized.md#%E5%B0%8F%E7%BA%A2%E6%88%90%E5%8A%9F%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [🍺 下一站](workflow-centralized.md#-%E4%B8%8B%E4%B8%80%E7%AB%99)
- [功能分支工作流](workflow-feature-branch.md)
- [工作方式](workflow-feature-branch.md#beer-工作方式)
- [🍺 工作方式](workflow-feature-branch.md#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [`Pull Requests`](workflow-feature-branch.md#pull-requests)
- [示例](workflow-feature-branch.md#beer-示例)
1. [小红开始开发一个新功能](workflow-feature-branch.md#小红开始开发一个新功能)
1. [小红要去吃个午饭](workflow-feature-branch.md#小红要去吃个午饭)
1. [小红完成功能开发](workflow-feature-branch.md#小红完成功能开发)
1. [小黑收到`Pull Request`](workflow-feature-branch.md#小黑收到pull-request)
1. [小红再做修改](workflow-feature-branch.md#小红再做修改)
1. [小红发布她的功能](workflow-feature-branch.md#小红发布她的功能)
1. [与此同时，小明在做和小红一样的事](workflow-feature-branch.md#与此同时小明在做和小红一样的事)
- [下一站](workflow-feature-branch.md#beer-下一站)
- [🍺 示例](workflow-feature-branch.md#-%E7%A4%BA%E4%BE%8B)
- [小红开始开发一个新功能](workflow-feature-branch.md#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%A7%8B%E5%BC%80%E5%8F%91%E4%B8%80%E4%B8%AA%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红要去吃个午饭](workflow-feature-branch.md#%E5%B0%8F%E7%BA%A2%E8%A6%81%E5%8E%BB%E5%90%83%E4%B8%AA%E5%8D%88%E9%A5%AD)
- [小红完成功能开发](workflow-feature-branch.md#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8A%9F%E8%83%BD%E5%BC%80%E5%8F%91)
- [小黑收到`Pull Request`](workflow-feature-branch.md#%E5%B0%8F%E9%BB%91%E6%94%B6%E5%88%B0pull-request)
- [小红再做修改](workflow-feature-branch.md#%E5%B0%8F%E7%BA%A2%E5%86%8D%E5%81%9A%E4%BF%AE%E6%94%B9)
- [小红发布她的功能](workflow-feature-branch.md#%E5%B0%8F%E7%BA%A2%E5%8F%91%E5%B8%83%E5%A5%B9%E7%9A%84%E5%8A%9F%E8%83%BD)
- [与此同时，小明在做和小红一样的事](workflow-feature-branch.md#%E4%B8%8E%E6%AD%A4%E5%90%8C%E6%97%B6%E5%B0%8F%E6%98%8E%E5%9C%A8%E5%81%9A%E5%92%8C%E5%B0%8F%E7%BA%A2%E4%B8%80%E6%A0%B7%E7%9A%84%E4%BA%8B)
- [🍺 下一站](workflow-feature-branch.md#-%E4%B8%8B%E4%B8%80%E7%AB%99)
- [`Gitflow`工作流](workflow-gitflow.md)
- [工作方式](workflow-gitflow.md#beer-工作方式)
- [历史分支](workflow-gitflow.md#历史分支)
- [功能分支](workflow-gitflow.md#功能分支)
- [发布分支](workflow-gitflow.md#发布分支)
- [维护分支](workflow-gitflow.md#维护分支)
- [示例](workflow-gitflow.md#beer-示例)
1. [创建开发分支](workflow-gitflow.md#创建开发分支)
1. [小红和小明开始开发新功能](workflow-gitflow.md#小红和小明开始开发新功能)
1. [小红完成功能开发](workflow-gitflow.md#小红完成功能开发)
1. [小红开始准备发布](workflow-gitflow.md#小红开始准备发布)
1. [小红完成发布](workflow-gitflow.md#小红完成发布)
1. [最终用户发现`Bug`](workflow-gitflow.md#最终用户发现bug)
- [下一站](workflow-gitflow.md#beer-下一站)
- [🍺 工作方式](workflow-gitflow.md#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [历史分支](workflow-gitflow.md#%E5%8E%86%E5%8F%B2%E5%88%86%E6%94%AF)
- [功能分支](workflow-gitflow.md#%E5%8A%9F%E8%83%BD%E5%88%86%E6%94%AF)
- [发布分支](workflow-gitflow.md#%E5%8F%91%E5%B8%83%E5%88%86%E6%94%AF)
- [维护分支](workflow-gitflow.md#%E7%BB%B4%E6%8A%A4%E5%88%86%E6%94%AF)
- [🍺 示例](workflow-gitflow.md#-%E7%A4%BA%E4%BE%8B)
- [创建开发分支](workflow-gitflow.md#%E5%88%9B%E5%BB%BA%E5%BC%80%E5%8F%91%E5%88%86%E6%94%AF)
- [小红和小明开始开发新功能](workflow-gitflow.md#%E5%B0%8F%E7%BA%A2%E5%92%8C%E5%B0%8F%E6%98%8E%E5%BC%80%E5%A7%8B%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红完成功能开发](workflow-gitflow.md#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8A%9F%E8%83%BD%E5%BC%80%E5%8F%91)
- [小红开始准备发布](workflow-gitflow.md#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%A7%8B%E5%87%86%E5%A4%87%E5%8F%91%E5%B8%83)
- [小红完成发布](workflow-gitflow.md#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8F%91%E5%B8%83)
- [最终用户发现`Bug`](workflow-gitflow.md#%E6%9C%80%E7%BB%88%E7%94%A8%E6%88%B7%E5%8F%91%E7%8E%B0bug)
- [🍺 下一站](workflow-gitflow.md#-%E4%B8%8B%E4%B8%80%E7%AB%99)
- [`Forking`工作流](workflow-forking.md)
- [工作方式](workflow-forking.md#beer-工作方式)
- [正式仓库](workflow-forking.md#正式仓库)
- [`Forking`工作流的分支使用方式](workflow-forking.md#forking工作流的分支使用方式)
- [示例](workflow-forking.md#beer-示例)
1. [项目维护者初始化正式仓库](workflow-forking.md#项目维护者初始化正式仓库)
1. [开发者`fork`正式仓库](workflow-forking.md#开发者fork正式仓库)
1. [开发者克隆自己`fork`出来的仓库](workflow-forking.md#开发者克隆自己fork出来的仓库)
1. [开发者开发自己的功能](workflow-forking.md#开发者开发自己的功能)
1. [开发者发布自己的功能](workflow-forking.md#开发者发布自己的功能)
1. [项目维护者集成开发者的功能](workflow-forking.md#项目维护者集成开发者的功能)
1. [开发者和正式仓库做同步](workflow-forking.md#开发者和正式仓库做同步)
- [下一站](workflow-forking.md#beer-下一站)
- [🍺 工作方式](workflow-forking.md#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [正式仓库](workflow-forking.md#%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [`Forking`工作流的分支使用方式](workflow-forking.md#forking%E5%B7%A5%E4%BD%9C%E6%B5%81%E7%9A%84%E5%88%86%E6%94%AF%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F)
- [🍺 示例](workflow-forking.md#-%E7%A4%BA%E4%BE%8B)
- [项目维护者初始化正式仓库](workflow-forking.md#%E9%A1%B9%E7%9B%AE%E7%BB%B4%E6%8A%A4%E8%80%85%E5%88%9D%E5%A7%8B%E5%8C%96%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [开发者`fork`正式仓库](workflow-forking.md#%E5%BC%80%E5%8F%91%E8%80%85fork%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [开发者克隆自己`fork`出来的仓库](workflow-forking.md#%E5%BC%80%E5%8F%91%E8%80%85%E5%85%8B%E9%9A%86%E8%87%AA%E5%B7%B1fork%E5%87%BA%E6%9D%A5%E7%9A%84%E4%BB%93%E5%BA%93)
- [开发者开发自己的功能](workflow-forking.md#%E5%BC%80%E5%8F%91%E8%80%85%E5%BC%80%E5%8F%91%E8%87%AA%E5%B7%B1%E7%9A%84%E5%8A%9F%E8%83%BD)
- [开发者发布自己的功能](workflow-forking.md#%E5%BC%80%E5%8F%91%E8%80%85%E5%8F%91%E5%B8%83%E8%87%AA%E5%B7%B1%E7%9A%84%E5%8A%9F%E8%83%BD)
- [项目维护者集成开发者的功能](workflow-forking.md#%E9%A1%B9%E7%9B%AE%E7%BB%B4%E6%8A%A4%E8%80%85%E9%9B%86%E6%88%90%E5%BC%80%E5%8F%91%E8%80%85%E7%9A%84%E5%8A%9F%E8%83%BD)
- [开发者和正式仓库做同步](workflow-forking.md#%E5%BC%80%E5%8F%91%E8%80%85%E5%92%8C%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93%E5%81%9A%E5%90%8C%E6%AD%A5)
- [🍺 下一站](workflow-forking.md#-%E4%B8%8B%E4%B8%80%E7%AB%99)
- [`Pull Requests`](pull-request.md)
- [解析`Pull Request`](pull-request.md#解析pull-request)
- [工作方式](pull-request.md#beer-工作方式)
- [在功能分支工作流中使用`Pull Request`](pull-request.md#在功能分支工作流中使用pull-request)
- [在`Gitflow`工作流中使用`Pull Request`](pull-request.md#在gitflow工作流中使用pull-request)
- [在`Forking`工作流中使用`Pull Request`](pull-request.md#在forking工作流中使用pull-request)
- [示例](pull-request.md#beer-示例)
1. [小红`fork`正式项目](pull-request.md#小红fork正式项目)
1. [小红克隆她的`Bitbucket`仓库](pull-request.md#小红克隆她的bitbucket仓库)
1. [小红开发新功能](pull-request.md#小红开发新功能)
1. [小红`push`功能到她的`Bitbucket`仓库中](pull-request.md#小红push功能到她的bitbucket仓库中)
1. [小红发起`Pull Request`](pull-request.md#小红发起pull-request)
1. [小明review `Pull Request`](pull-request.md#小明review-pull-request)
1. [小红补加提交](pull-request.md#小红补加提交)
- [下一站](pull-request.md#beer-下一站)
- [解析`Pull Request`](pull-request.md#%E8%A7%A3%E6%9E%90pull-request)
- [🍺 工作方式](pull-request.md#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [在功能分支工作流中使用`Pull Request`](pull-request.md#%E5%9C%A8%E5%8A%9F%E8%83%BD%E5%88%86%E6%94%AF%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [在`Gitflow`工作流中使用`Pull Request`](pull-request.md#%E5%9C%A8gitflow%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [在`Forking`工作流中使用`Pull Request`](pull-request.md#%E5%9C%A8forking%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [🍺 示例](pull-request.md#-%E7%A4%BA%E4%BE%8B)
- [小红`fork`正式项目](pull-request.md#%E5%B0%8F%E7%BA%A2fork%E6%AD%A3%E5%BC%8F%E9%A1%B9%E7%9B%AE)
- [小红克隆她的`Bitbucket`仓库](pull-request.md#%E5%B0%8F%E7%BA%A2%E5%85%8B%E9%9A%86%E5%A5%B9%E7%9A%84bitbucket%E4%BB%93%E5%BA%93)
- [小红开发新功能](pull-request.md#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红`push`功能到她的`Bitbucket`仓库中](pull-request.md#%E5%B0%8F%E7%BA%A2push%E5%8A%9F%E8%83%BD%E5%88%B0%E5%A5%B9%E7%9A%84bitbucket%E4%BB%93%E5%BA%93%E4%B8%AD)
- [小红发起`Pull Request`](pull-request.md#%E5%B0%8F%E7%BA%A2%E5%8F%91%E8%B5%B7pull-request)
- [小明review `Pull Request`](pull-request.md#%E5%B0%8F%E6%98%8Ereview-pull-request)
- [小红补加提交](pull-request.md#%E5%B0%8F%E7%BA%A2%E8%A1%A5%E5%8A%A0%E6%8F%90%E4%BA%A4)
- [小明接受`Pull Request`](pull-request.md#%E5%B0%8F%E6%98%8E%E6%8E%A5%E5%8F%97pull-request)
- [🍺 下一站](pull-request.md#-%E4%B8%8B%E4%B8%80%E7%AB%99)

36
git-workflows-and-tutorials/pull-request.md
View File

@@ -1,20 +1,28 @@
`Pull Request`工作流
=======================
- [解析`Pull Request`](#解析pull-request)
- [工作方式](#beer-工作方式)
- [在功能分支工作流中使用`Pull Request`](#在功能分支工作流中使用pull-request)
- [在`Gitflow`工作流中使用`Pull Request`](#在gitflow工作流中使用pull-request)
- [在`Forking`工作流中使用`Pull Request`](#在forking工作流中使用pull-request)
- [示例](#beer-示例)
1. [小红`fork`正式项目](#小红fork正式项目)
1. [小红克隆她的`Bitbucket`仓库](#小红克隆她的bitbucket仓库)
1. [小红开发新功能](#小红开发新功能)
1. [小红`push`功能到她的`Bitbucket`仓库中](#小红push功能到她的bitbucket仓库中)
1. [小红发起`Pull Request`](#小红发起pull-request)
1. [小明review `Pull Request`](#小明review-pull-request)
1. [小红补加提交](#小红补加提交)
- [下一站](#beer-下一站)
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [解析`Pull Request`](#%E8%A7%A3%E6%9E%90pull-request)
- [🍺 工作方式](#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [在功能分支工作流中使用`Pull Request`](#%E5%9C%A8%E5%8A%9F%E8%83%BD%E5%88%86%E6%94%AF%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [在`Gitflow`工作流中使用`Pull Request`](#%E5%9C%A8gitflow%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [在`Forking`工作流中使用`Pull Request`](#%E5%9C%A8forking%E5%B7%A5%E4%BD%9C%E6%B5%81%E4%B8%AD%E4%BD%BF%E7%94%A8pull-request)
- [🍺 示例](#-%E7%A4%BA%E4%BE%8B)
- [小红`fork`正式项目](#%E5%B0%8F%E7%BA%A2fork%E6%AD%A3%E5%BC%8F%E9%A1%B9%E7%9B%AE)
- [小红克隆她的`Bitbucket`仓库](#%E5%B0%8F%E7%BA%A2%E5%85%8B%E9%9A%86%E5%A5%B9%E7%9A%84bitbucket%E4%BB%93%E5%BA%93)
- [小红开发新功能](#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红`push`功能到她的`Bitbucket`仓库中](#%E5%B0%8F%E7%BA%A2push%E5%8A%9F%E8%83%BD%E5%88%B0%E5%A5%B9%E7%9A%84bitbucket%E4%BB%93%E5%BA%93%E4%B8%AD)
- [小红发起`Pull Request`](#%E5%B0%8F%E7%BA%A2%E5%8F%91%E8%B5%B7pull-request)
- [小明review `Pull Request`](#%E5%B0%8F%E6%98%8Ereview-pull-request)
- [小红补加提交](#%E5%B0%8F%E7%BA%A2%E8%A1%A5%E5%8A%A0%E6%8F%90%E4%BA%A4)
- [小明接受`Pull Request`](#%E5%B0%8F%E6%98%8E%E6%8E%A5%E5%8F%97pull-request)
- [🍺 下一站](#-%E4%B8%8B%E4%B8%80%E7%AB%99)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
`Pull Requests`是`Bitbucket`上方便开发者之间协作的功能。
提供了一个用户友好的`Web`界面，在集成提交的变更到正式项目前可以对变更进行讨论。

32
git-workflows-and-tutorials/workflow-centralized.md
View File

@@ -1,19 +1,25 @@
集中式工作流
=================================
- [工作方式](#beer-工作方式)
- [冲突解决](#冲突解决)
- [示例](#beer-示例)
1. [有人先初始化好中央仓库](#有人先初始化好中央仓库)
1. [所有人克隆中央仓库](#所有人克隆中央仓库)
1. [小明开发功能](#小明开发功能)
1. [小红开发功能](#小红开发功能)
1. [小明发布功能](#小明发布功能)
1. [小红试着发布功能](#小红试着发布功能)
1. [小红在小明的提交之上`rebase`](#小红在小明的提交之上rebase)
1. [小红解决合并冲突](#小红解决合并冲突)
1. [小红成功发布功能](#小红成功发布功能)
- [下一站](#beer-下一站)
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [🍺 工作方式](#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [冲突解决](#%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3)
- [🍺 示例](#-%E7%A4%BA%E4%BE%8B)
- [有人先初始化好中央仓库](#%E6%9C%89%E4%BA%BA%E5%85%88%E5%88%9D%E5%A7%8B%E5%8C%96%E5%A5%BD%E4%B8%AD%E5%A4%AE%E4%BB%93%E5%BA%93)
- [所有人克隆中央仓库](#%E6%89%80%E6%9C%89%E4%BA%BA%E5%85%8B%E9%9A%86%E4%B8%AD%E5%A4%AE%E4%BB%93%E5%BA%93)
- [小明开发功能](#%E5%B0%8F%E6%98%8E%E5%BC%80%E5%8F%91%E5%8A%9F%E8%83%BD)
- [小红开发功能](#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%8F%91%E5%8A%9F%E8%83%BD)
- [小明发布功能](#%E5%B0%8F%E6%98%8E%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [小红试着发布功能](#%E5%B0%8F%E7%BA%A2%E8%AF%95%E7%9D%80%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [小红在小明的提交之上`rebase`](#%E5%B0%8F%E7%BA%A2%E5%9C%A8%E5%B0%8F%E6%98%8E%E7%9A%84%E6%8F%90%E4%BA%A4%E4%B9%8B%E4%B8%8Arebase)
- [小红解决合并冲突](#%E5%B0%8F%E7%BA%A2%E8%A7%A3%E5%86%B3%E5%90%88%E5%B9%B6%E5%86%B2%E7%AA%81)
- [小红成功发布功能](#%E5%B0%8F%E7%BA%A2%E6%88%90%E5%8A%9F%E5%8F%91%E5%B8%83%E5%8A%9F%E8%83%BD)
- [🍺 下一站](#-%E4%B8%8B%E4%B8%80%E7%AB%99)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
![Git Workflows: SVN-style](images/git-workflow-svn.png)

27
git-workflows-and-tutorials/workflow-feature-branch.md
View File

@@ -1,17 +1,24 @@
功能分支工作流
======================
- [工作方式](#beer-工作方式)
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [🍺 工作方式](#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [`Pull Requests`](#pull-requests)
- [示例](#beer-示例)
1. [小红开始开发一个新功能](#小红开始开发一个新功能)
1. [小红要去吃个午饭](#小红要去吃个午饭)
1. [小红完成功能开发](#小红完成功能开发)
1. [小黑收到`Pull Request`](#小黑收到pull-request)
1. [小红再做修改](#小红再做修改)
1. [小红发布她的功能](#小红发布她的功能)
1. [与此同时，小明在做和小红一样的事](#与此同时小明在做和小红一样的事)
- [下一站](#beer-下一站)
- [🍺 示例](#-%E7%A4%BA%E4%BE%8B)
- [小红开始开发一个新功能](#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%A7%8B%E5%BC%80%E5%8F%91%E4%B8%80%E4%B8%AA%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红要去吃个午饭](#%E5%B0%8F%E7%BA%A2%E8%A6%81%E5%8E%BB%E5%90%83%E4%B8%AA%E5%8D%88%E9%A5%AD)
- [小红完成功能开发](#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8A%9F%E8%83%BD%E5%BC%80%E5%8F%91)
- [小黑收到`Pull Request`](#%E5%B0%8F%E9%BB%91%E6%94%B6%E5%88%B0pull-request)
- [小红再做修改](#%E5%B0%8F%E7%BA%A2%E5%86%8D%E5%81%9A%E4%BF%AE%E6%94%B9)
- [小红发布她的功能](#%E5%B0%8F%E7%BA%A2%E5%8F%91%E5%B8%83%E5%A5%B9%E7%9A%84%E5%8A%9F%E8%83%BD)
- [与此同时，小明在做和小红一样的事](#%E4%B8%8E%E6%AD%A4%E5%90%8C%E6%97%B6%E5%B0%8F%E6%98%8E%E5%9C%A8%E5%81%9A%E5%92%8C%E5%B0%8F%E7%BA%A2%E4%B8%80%E6%A0%B7%E7%9A%84%E4%BA%8B)
- [🍺 下一站](#-%E4%B8%8B%E4%B8%80%E7%AB%99)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
![](images/git-workflow-feature-branch-1.png)

31
git-workflows-and-tutorials/workflow-forking.md
View File

@@ -1,18 +1,25 @@
`Forking`工作流
=======================
- [工作方式](#beer-工作方式)
- [正式仓库](#正式仓库)
- [`Forking`工作流的分支使用方式](#forking工作流的分支使用方式)
- [示例](#beer-示例)
1. [项目维护者初始化正式仓库](#项目维护者初始化正式仓库)
1. [开发者`fork`正式仓库](#开发者fork正式仓库)
1. [开发者克隆自己`fork`出来的仓库](#开发者克隆自己fork出来的仓库)
1. [开发者开发自己的功能](#开发者开发自己的功能)
1. [开发者发布自己的功能](#开发者发布自己的功能)
1. [项目维护者集成开发者的功能](#项目维护者集成开发者的功能)
1. [开发者和正式仓库做同步](#开发者和正式仓库做同步)
- [下一站](#beer-下一站)
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [🍺 工作方式](#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [正式仓库](#%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [`Forking`工作流的分支使用方式](#forking%E5%B7%A5%E4%BD%9C%E6%B5%81%E7%9A%84%E5%88%86%E6%94%AF%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F)
- [🍺 示例](#-%E7%A4%BA%E4%BE%8B)
- [项目维护者初始化正式仓库](#%E9%A1%B9%E7%9B%AE%E7%BB%B4%E6%8A%A4%E8%80%85%E5%88%9D%E5%A7%8B%E5%8C%96%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [开发者`fork`正式仓库](#%E5%BC%80%E5%8F%91%E8%80%85fork%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93)
- [开发者克隆自己`fork`出来的仓库](#%E5%BC%80%E5%8F%91%E8%80%85%E5%85%8B%E9%9A%86%E8%87%AA%E5%B7%B1fork%E5%87%BA%E6%9D%A5%E7%9A%84%E4%BB%93%E5%BA%93)
- [开发者开发自己的功能](#%E5%BC%80%E5%8F%91%E8%80%85%E5%BC%80%E5%8F%91%E8%87%AA%E5%B7%B1%E7%9A%84%E5%8A%9F%E8%83%BD)
- [开发者发布自己的功能](#%E5%BC%80%E5%8F%91%E8%80%85%E5%8F%91%E5%B8%83%E8%87%AA%E5%B7%B1%E7%9A%84%E5%8A%9F%E8%83%BD)
- [项目维护者集成开发者的功能](#%E9%A1%B9%E7%9B%AE%E7%BB%B4%E6%8A%A4%E8%80%85%E9%9B%86%E6%88%90%E5%BC%80%E5%8F%91%E8%80%85%E7%9A%84%E5%8A%9F%E8%83%BD)
- [开发者和正式仓库做同步](#%E5%BC%80%E5%8F%91%E8%80%85%E5%92%8C%E6%AD%A3%E5%BC%8F%E4%BB%93%E5%BA%93%E5%81%9A%E5%90%8C%E6%AD%A5)
- [🍺 下一站](#-%E4%B8%8B%E4%B8%80%E7%AB%99)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
`Forking`工作流和前面讨论的几种工作流有根本的不同。
这种工作流不是使用单个服务端仓库作为『中央』代码基线，而让各个开发者都有一个服务端仓库。

33
git-workflows-and-tutorials/workflow-gitflow.md
View File

@@ -1,19 +1,26 @@
`Gitflow`工作流
============================
- [工作方式](#beer-工作方式)
- [历史分支](#历史分支)
- [功能分支](#功能分支)
- [发布分支](#发布分支)
- [维护分支](#维护分支)
- [示例](#beer-示例)
1. [创建开发分支](#创建开发分支)
1. [小红和小明开始开发新功能](#小红和小明开始开发新功能)
1. [小红完成功能开发](#小红完成功能开发)
1. [小红开始准备发布](#小红开始准备发布)
1. [小红完成发布](#小红完成发布)
1. [最终用户发现`Bug`](#最终用户发现bug)
- [下一站](#beer-下一站)
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
- [🍺 工作方式](#-%E5%B7%A5%E4%BD%9C%E6%96%B9%E5%BC%8F)
- [历史分支](#%E5%8E%86%E5%8F%B2%E5%88%86%E6%94%AF)
- [功能分支](#%E5%8A%9F%E8%83%BD%E5%88%86%E6%94%AF)
- [发布分支](#%E5%8F%91%E5%B8%83%E5%88%86%E6%94%AF)
- [维护分支](#%E7%BB%B4%E6%8A%A4%E5%88%86%E6%94%AF)
- [🍺 示例](#-%E7%A4%BA%E4%BE%8B)
- [创建开发分支](#%E5%88%9B%E5%BB%BA%E5%BC%80%E5%8F%91%E5%88%86%E6%94%AF)
- [小红和小明开始开发新功能](#%E5%B0%8F%E7%BA%A2%E5%92%8C%E5%B0%8F%E6%98%8E%E5%BC%80%E5%A7%8B%E5%BC%80%E5%8F%91%E6%96%B0%E5%8A%9F%E8%83%BD)
- [小红完成功能开发](#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8A%9F%E8%83%BD%E5%BC%80%E5%8F%91)
- [小红开始准备发布](#%E5%B0%8F%E7%BA%A2%E5%BC%80%E5%A7%8B%E5%87%86%E5%A4%87%E5%8F%91%E5%B8%83)
- [小红完成发布](#%E5%B0%8F%E7%BA%A2%E5%AE%8C%E6%88%90%E5%8F%91%E5%B8%83)
- [最终用户发现`Bug`](#%E6%9C%80%E7%BB%88%E7%94%A8%E6%88%B7%E5%8F%91%E7%8E%B0bug)
- [🍺 下一站](#-%E4%B8%8B%E4%B8%80%E7%AB%99)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
![Git Workflows: Gitflow Cycle](images/git-workflows-gitflow.png)