原文と明確に区別

gitlab_flow.md

@@ -2,17 +2,20 @@
 
 
 ## Introduction
 ## Introduction
 
 
-Version management with git makes branching and merging much easier than older versioning systems such as SVN.
 gitを用いたバージョン管理はSVNをはじめとする従来のバージョン管理システムよりも容易なブランチ管理とマージを可能にします。
 gitを用いたバージョン管理はSVNをはじめとする従来のバージョン管理システムよりも容易なブランチ管理とマージを可能にします。
-This allows a wide variety of branching strategies and workflows.
 これはより多くのブランチ管理方法とワークフローを実現可能であることを意味します。
 これはより多くのブランチ管理方法とワークフローを実現可能であることを意味します。
 Almost all of these are an improvement over the methods used before git.
 Almost all of these are an improvement over the methods used before git.
-But many organizations end up with a workflow that is not clearly defined, overly complex or not integrated with issue tracking systems.
 しかし多くの組織でははっきりと定められていないか、過度に複雑か、または課題管理システムと統合されていないワークフローが用いられています。
 しかし多くの組織でははっきりと定められていないか、過度に複雑か、または課題管理システムと統合されていないワークフローが用いられています。
-Therefore we propose the GitLab flow as clearly defined set of best practices.
 そこで私たち(訳注：GitLab)はGitLab Flowをベストプラクティスとして明確に定義します。
 そこで私たち(訳注：GitLab)はGitLab Flowをベストプラクティスとして明確に定義します。
 It combines [feature driven development](https://en.wikipedia.org/wiki/Feature-driven_development) and [feature branches](http://martinfowler.com/bliki/FeatureBranch.html) with issue tracking.
 It combines [feature driven development](https://en.wikipedia.org/wiki/Feature-driven_development) and [feature branches](http://martinfowler.com/bliki/FeatureBranch.html) with issue tracking.
 
 
+Version management with git makes branching and merging much easier than older versioning systems such as SVN.
+This allows a wide variety of branching strategies and workflows.
+Almost all of these are an improvement over the methods used before git.
+But many organizations end up with a workflow that is not clearly defined, overly complex or not integrated with issue tracking systems.
+Therefore we propose the GitLab flow as clearly defined set of best practices.
+It combines [feature driven development](https://en.wikipedia.org/wiki/Feature-driven_development) and [feature branches](http://martinfowler.com/bliki/FeatureBranch.html) with issue tracking.
+
 Organizations coming to git from other version control systems frequently find it hard to develop an effective workflow.
 Organizations coming to git from other version control systems frequently find it hard to develop an effective workflow.
 This article describes the GitLab flow that integrates the git workflow with an issue tracking system.
 This article describes the GitLab flow that integrates the git workflow with an issue tracking system.
 It offers a simple, transparent and effective way to work with git.
 It offers a simple, transparent and effective way to work with git.