diff --git a/git-workflows-and-tutorials/README.md b/git-workflows-and-tutorials/README.md index aeee894..d3647aa 100644 --- a/git-workflows-and-tutorials/README.md +++ b/git-workflows-and-tutorials/README.md @@ -98,27 +98,27 @@ - [工作方式](workflow-centralized.md#beer-工作方式) - [冲突解决](workflow-centralized.md#冲突解决) - [示例](workflow-centralized.md#beer-示例) - - [有人先初始化好中央仓库](workflow-centralized.md#有人先初始化好中央仓库) - - [所有人克隆中央仓库](workflow-centralized.md#所有人克隆中央仓库) - - [小明开发功能](workflow-centralized.md#小明开发功能) - - [小红开发功能](workflow-centralized.md#小红开发功能) - - [小明发布功能](workflow-centralized.md#小明发布功能) - - [小红试着发布功能](workflow-centralized.md#小红试着发布功能) - - [小红在小明的提交之上`rebase`](workflow-centralized.md#小红在小明的提交之上rebase) - - [小红解决合并冲突](workflow-centralized.md#小红解决合并冲突) - - [小红成功发布功能](workflow-centralized.md#小红成功发布功能) + 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-feature-branch.md) - [工作方式](workflow-feature-branch.md#beer-工作方式) - [`Pull Requests`](workflow-feature-branch.md#pull-requests) - [示例](workflow-feature-branch.md#beer-示例) - - [小红开始开发一个新功能](workflow-feature-branch.md#小红开始开发一个新功能) - - [小红要去吃个午饭](workflow-feature-branch.md#小红要去吃个午饭) - - [小红完成功能开发](workflow-feature-branch.md#小红完成功能开发) - - [小黑收到`Pull Request`](workflow-feature-branch.md#小黑收到pull-request) - - [小红再做修改](workflow-feature-branch.md#小红再做修改) - - [小红发布她的功能](workflow-feature-branch.md#小红发布她的功能) - - [与此同时，小明在做和小红一样的事](workflow-feature-branch.md#与此同时小明在做和小红一样的事) + 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-下一站) - [`Gitflow`工作流](workflow-gitflow.md) - [工作方式](workflow-gitflow.md#beer-工作方式) @@ -127,25 +127,25 @@ - [发布分支](workflow-gitflow.md#发布分支) - [维护分支](workflow-gitflow.md#维护分支) - [示例](workflow-gitflow.md#beer-示例) - - [创建开发分支](workflow-gitflow.md#创建开发分支) - - [小红和小明开始开发新功能](workflow-gitflow.md#小红和小明开始开发新功能) - - [小红完成功能开发](workflow-gitflow.md#小红完成功能开发) - - [小红开始准备发布](workflow-gitflow.md#小红开始准备发布) - - [小红完成发布](workflow-gitflow.md#小红完成发布) - - [最终用户发现`Bug`](workflow-gitflow.md#最终用户发现bug) + 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-下一站) - [`Forking`工作流](workflow-forking.md) - [工作方式](workflow-forking.md#beer-工作方式) - [正式仓库](workflow-forking.md#正式仓库) - [`Forking`工作流的分支使用方式](workflow-forking.md#forking工作流的分支使用方式) - [示例](workflow-forking.md#beer-示例) - - [项目维护者初始化正式仓库](workflow-forking.md#项目维护者初始化正式仓库) - - [开发者`fork`正式仓库](workflow-forking.md#开发者fork正式仓库) - - [开发者克隆自己`fork`出来的仓库](workflow-forking.md#开发者克隆自己fork出来的仓库) - - [开发者开发自己的功能](workflow-forking.md#开发者开发自己的功能) - - [开发者发布自己的功能](workflow-forking.md#开发者发布自己的功能) - - [项目维护者集成开发者的功能](workflow-forking.md#项目维护者集成开发者的功能) - - [开发者和正式仓库做同步](workflow-forking.md#开发者和正式仓库做同步) + 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-下一站) - [`Pull Requests`](pull-request.md) - [解析`Pull Request`](pull-request.md#解析pull-request) @@ -154,11 +154,11 @@ - [在`Gitflow`工作流中使用`Pull Request`](pull-request.md#在gitflow工作流中使用pull-request) - [在`Forking`工作流中使用`Pull Request`](pull-request.md#在forking工作流中使用pull-request) - [示例](pull-request.md#beer-示例) - - [小红`fork`正式项目](pull-request.md#小红fork正式项目) - - [小红克隆她的`Bitbucket`仓库](pull-request.md#小红克隆她的bitbucket仓库) - - [小红开发新功能](pull-request.md#小红开发新功能) - - [小红`push`功能到她的`Bitbucket`仓库中](pull-request.md#小红push功能到她的bitbucket仓库中) - - [小红发起`Pull Request`](pull-request.md#小红发起pull-request) - - [小明review `Pull Request`](pull-request.md#小明review-pull-request) - - [小红补加提交](pull-request.md#小红补加提交) + 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-下一站) diff --git a/git-workflows-and-tutorials/pull-request.md b/git-workflows-and-tutorials/pull-request.md index ca8de16..c2ef4ee 100644 --- a/git-workflows-and-tutorials/pull-request.md +++ b/git-workflows-and-tutorials/pull-request.md @@ -7,13 +7,13 @@ - [在`Gitflow`工作流中使用`Pull Request`](#在gitflow工作流中使用pull-request) - [在`Forking`工作流中使用`Pull Request`](#在forking工作流中使用pull-request) - [示例](#beer-示例) - - [小红`fork`正式项目](#小红fork正式项目) - - [小红克隆她的`Bitbucket`仓库](#小红克隆她的bitbucket仓库) - - [小红开发新功能](#小红开发新功能) - - [小红`push`功能到她的`Bitbucket`仓库中](#小红push功能到她的bitbucket仓库中) - - [小红发起`Pull Request`](#小红发起pull-request) - - [小明review `Pull Request`](#小明review-pull-request) - - [小红补加提交](#小红补加提交) + 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-下一站) `Pull Requests`是`Bitbucket`上方便开发者之间协作的功能。 diff --git a/git-workflows-and-tutorials/workflow-centralized.md b/git-workflows-and-tutorials/workflow-centralized.md index d433590..d55413e 100644 --- a/git-workflows-and-tutorials/workflow-centralized.md +++ b/git-workflows-and-tutorials/workflow-centralized.md @@ -4,15 +4,15 @@ - [工作方式](#beer-工作方式) - [冲突解决](#冲突解决) - [示例](#beer-示例) - - [有人先初始化好中央仓库](#有人先初始化好中央仓库) - - [所有人克隆中央仓库](#所有人克隆中央仓库) - - [小明开发功能](#小明开发功能) - - [小红开发功能](#小红开发功能) - - [小明发布功能](#小明发布功能) - - [小红试着发布功能](#小红试着发布功能) - - [小红在小明的提交之上`rebase`](#小红在小明的提交之上rebase) - - [小红解决合并冲突](#小红解决合并冲突) - - [小红成功发布功能](#小红成功发布功能) + 1. [有人先初始化好中央仓库](#有人先初始化好中央仓库) + 1. [所有人克隆中央仓库](#所有人克隆中央仓库) + 1. [小明开发功能](#小明开发功能) + 1. [小红开发功能](#小红开发功能) + 1. [小明发布功能](#小明发布功能) + 1. [小红试着发布功能](#小红试着发布功能) + 1. [小红在小明的提交之上`rebase`](#小红在小明的提交之上rebase) + 1. [小红解决合并冲突](#小红解决合并冲突) + 1. [小红成功发布功能](#小红成功发布功能) - [下一站](#beer-下一站) ![Git Workflows: SVN-style](images/git-workflow-svn.png) diff --git a/git-workflows-and-tutorials/workflow-feature-branch.md b/git-workflows-and-tutorials/workflow-feature-branch.md index d4a52d7..dadc997 100644 --- a/git-workflows-and-tutorials/workflow-feature-branch.md +++ b/git-workflows-and-tutorials/workflow-feature-branch.md @@ -4,13 +4,13 @@ - [工作方式](#beer-工作方式) - [`Pull Requests`](#pull-requests) - [示例](#beer-示例) - - [小红开始开发一个新功能](#小红开始开发一个新功能) - - [小红要去吃个午饭](#小红要去吃个午饭) - - [小红完成功能开发](#小红完成功能开发) - - [小黑收到`Pull Request`](#小黑收到pull-request) - - [小红再做修改](#小红再做修改) - - [小红发布她的功能](#小红发布她的功能) - - [与此同时，小明在做和小红一样的事](#与此同时小明在做和小红一样的事) + 1. [小红开始开发一个新功能](#小红开始开发一个新功能) + 1. [小红要去吃个午饭](#小红要去吃个午饭) + 1. [小红完成功能开发](#小红完成功能开发) + 1. [小黑收到`Pull Request`](#小黑收到pull-request) + 1. [小红再做修改](#小红再做修改) + 1. [小红发布她的功能](#小红发布她的功能) + 1. [与此同时，小明在做和小红一样的事](#与此同时小明在做和小红一样的事) - [下一站](#beer-下一站) ![](images/git-workflow-feature-branch-1.png) diff --git a/git-workflows-and-tutorials/workflow-forking.md b/git-workflows-and-tutorials/workflow-forking.md index 5f17e3d..b155478 100644 --- a/git-workflows-and-tutorials/workflow-forking.md +++ b/git-workflows-and-tutorials/workflow-forking.md @@ -5,13 +5,13 @@ - [正式仓库](#正式仓库) - [`Forking`工作流的分支使用方式](#forking工作流的分支使用方式) - [示例](#beer-示例) - - [项目维护者初始化正式仓库](#项目维护者初始化正式仓库) - - [开发者`fork`正式仓库](#开发者fork正式仓库) - - [开发者克隆自己`fork`出来的仓库](#开发者克隆自己fork出来的仓库) - - [开发者开发自己的功能](#开发者开发自己的功能) - - [开发者发布自己的功能](#开发者发布自己的功能) - - [项目维护者集成开发者的功能](#项目维护者集成开发者的功能) - - [开发者和正式仓库做同步](#开发者和正式仓库做同步) + 1. [项目维护者初始化正式仓库](#项目维护者初始化正式仓库) + 1. [开发者`fork`正式仓库](#开发者fork正式仓库) + 1. [开发者克隆自己`fork`出来的仓库](#开发者克隆自己fork出来的仓库) + 1. [开发者开发自己的功能](#开发者开发自己的功能) + 1. [开发者发布自己的功能](#开发者发布自己的功能) + 1. [项目维护者集成开发者的功能](#项目维护者集成开发者的功能) + 1. [开发者和正式仓库做同步](#开发者和正式仓库做同步) - [下一站](#beer-下一站) `Forking`工作流和前面讨论的几种工作流有根本的不同。 diff --git a/git-workflows-and-tutorials/workflow-gitflow.md b/git-workflows-and-tutorials/workflow-gitflow.md index 65ed6a0..beb4e5a 100644 --- a/git-workflows-and-tutorials/workflow-gitflow.md +++ b/git-workflows-and-tutorials/workflow-gitflow.md @@ -7,12 +7,12 @@ - [发布分支](#发布分支) - [维护分支](#维护分支) - [示例](#beer-示例) - - [创建开发分支](#创建开发分支) - - [小红和小明开始开发新功能](#小红和小明开始开发新功能) - - [小红完成功能开发](#小红完成功能开发) - - [小红开始准备发布](#小红开始准备发布) - - [小红完成发布](#小红完成发布) - - [最终用户发现`Bug`](#最终用户发现bug) + 1. [创建开发分支](#创建开发分支) + 1. [小红和小明开始开发新功能](#小红和小明开始开发新功能) + 1. [小红完成功能开发](#小红完成功能开发) + 1. [小红开始准备发布](#小红开始准备发布) + 1. [小红完成发布](#小红完成发布) + 1. [最终用户发现`Bug`](#最终用户发现bug) - [下一站](#beer-下一站) ![Git Workflows: Gitflow Cycle](images/git-workflows-gitflow.png)