diff --git a/documents/forGitBranch/img/branch_strategy_develop.drawio.png b/documents/forGitBranch/img/branch_strategy_develop.drawio.png index 81b0dc88..5bb16245 100644 Binary files a/documents/forGitBranch/img/branch_strategy_develop.drawio.png and b/documents/forGitBranch/img/branch_strategy_develop.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_feature.drawio.png b/documents/forGitBranch/img/branch_strategy_feature.drawio.png index bd503ec5..e306953f 100644 Binary files a/documents/forGitBranch/img/branch_strategy_feature.drawio.png and b/documents/forGitBranch/img/branch_strategy_feature.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_hotfix.drawio.png b/documents/forGitBranch/img/branch_strategy_hotfix.drawio.png index 37b4cccb..39a1bd3c 100644 Binary files a/documents/forGitBranch/img/branch_strategy_hotfix.drawio.png and b/documents/forGitBranch/img/branch_strategy_hotfix.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_multi_develop.drawio.png b/documents/forGitBranch/img/branch_strategy_multi_develop.drawio.png index 70657692..a4a88760 100644 Binary files a/documents/forGitBranch/img/branch_strategy_multi_develop.drawio.png and b/documents/forGitBranch/img/branch_strategy_multi_develop.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_multi_version.drawio.png b/documents/forGitBranch/img/branch_strategy_multi_version.drawio.png index 47e46d3f..49031af0 100644 Binary files a/documents/forGitBranch/img/branch_strategy_multi_version.drawio.png and b/documents/forGitBranch/img/branch_strategy_multi_version.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_release.drawio.png b/documents/forGitBranch/img/branch_strategy_release.drawio.png index e77e8d71..53e3a895 100644 Binary files a/documents/forGitBranch/img/branch_strategy_release.drawio.png and b/documents/forGitBranch/img/branch_strategy_release.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_release_multi_develop.drawio.png b/documents/forGitBranch/img/branch_strategy_release_multi_develop.drawio.png index fa87e2bf..cf27ef0c 100644 Binary files a/documents/forGitBranch/img/branch_strategy_release_multi_develop.drawio.png and b/documents/forGitBranch/img/branch_strategy_release_multi_develop.drawio.png differ diff --git a/documents/forGitBranch/img/branch_strategy_topic.drawio.png b/documents/forGitBranch/img/branch_strategy_topic.drawio.png index 2b7daf1b..4624495d 100644 Binary files a/documents/forGitBranch/img/branch_strategy_topic.drawio.png and b/documents/forGitBranch/img/branch_strategy_topic.drawio.png differ diff --git a/documents/forGitBranch/img/lightweight_gitbranch_flow.drawio.png b/documents/forGitBranch/img/lightweight_gitbranch_flow.drawio.png index bfe151ee..3a23fb15 100644 Binary files a/documents/forGitBranch/img/lightweight_gitbranch_flow.drawio.png and b/documents/forGitBranch/img/lightweight_gitbranch_flow.drawio.png differ diff --git "a/documents/forGitBranch/img/lightweight_gitbranch_flow_\345\220\214\346\234\237.drawio.png" "b/documents/forGitBranch/img/lightweight_gitbranch_flow_\345\220\214\346\234\237.drawio.png" index c0572495..58128081 100644 Binary files "a/documents/forGitBranch/img/lightweight_gitbranch_flow_\345\220\214\346\234\237.drawio.png" and "b/documents/forGitBranch/img/lightweight_gitbranch_flow_\345\220\214\346\234\237.drawio.png" differ diff --git a/documents/forGitBranch/img/merge_strategy_develop_to_feature.drawio.png b/documents/forGitBranch/img/merge_strategy_develop_to_feature.drawio.png index cf22db9f..cc52ed7e 100644 Binary files a/documents/forGitBranch/img/merge_strategy_develop_to_feature.drawio.png and b/documents/forGitBranch/img/merge_strategy_develop_to_feature.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_develop_to_feature_merge.drawio.png b/documents/forGitBranch/img/merge_strategy_develop_to_feature_merge.drawio.png index 13ee6282..8caee65d 100644 Binary files a/documents/forGitBranch/img/merge_strategy_develop_to_feature_merge.drawio.png and b/documents/forGitBranch/img/merge_strategy_develop_to_feature_merge.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_develop_to_feature_rebase.drawio.png b/documents/forGitBranch/img/merge_strategy_develop_to_feature_rebase.drawio.png index 415231d0..40acf6e9 100644 Binary files a/documents/forGitBranch/img/merge_strategy_develop_to_feature_rebase.drawio.png and b/documents/forGitBranch/img/merge_strategy_develop_to_feature_rebase.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_feature_to_develop_merge_commit.drawio.png b/documents/forGitBranch/img/merge_strategy_feature_to_develop_merge_commit.drawio.png index dee061da..d5aa95ce 100644 Binary files a/documents/forGitBranch/img/merge_strategy_feature_to_develop_merge_commit.drawio.png and b/documents/forGitBranch/img/merge_strategy_feature_to_develop_merge_commit.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_feature_to_develop_rebase_and_merge.drawio.png b/documents/forGitBranch/img/merge_strategy_feature_to_develop_rebase_and_merge.drawio.png index a57b23fa..27f9b78e 100644 Binary files a/documents/forGitBranch/img/merge_strategy_feature_to_develop_rebase_and_merge.drawio.png and b/documents/forGitBranch/img/merge_strategy_feature_to_develop_rebase_and_merge.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge.drawio.png b/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge.drawio.png index 54ac3816..ac8b2baa 100644 Binary files a/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge.drawio.png and b/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge.drawio.png differ diff --git a/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge_gitlab.drawio.png b/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge_gitlab.drawio.png index cb99f085..558f73f7 100644 Binary files a/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge_gitlab.drawio.png and b/documents/forGitBranch/img/merge_strategy_feature_to_develop_squash_and_merge_gitlab.drawio.png differ diff --git a/documents/forGitBranch/img/release_overtaking.drawio.png b/documents/forGitBranch/img/release_overtaking.drawio.png index 32fef1a8..3da65510 100644 Binary files a/documents/forGitBranch/img/release_overtaking.drawio.png and b/documents/forGitBranch/img/release_overtaking.drawio.png differ diff --git a/documents/forGitBranch/img/release_overtaking_hotfix.drawio.png b/documents/forGitBranch/img/release_overtaking_hotfix.drawio.png index b2e76709..99749210 100644 Binary files a/documents/forGitBranch/img/release_overtaking_hotfix.drawio.png and b/documents/forGitBranch/img/release_overtaking_hotfix.drawio.png differ diff --git a/documents/forGitBranch/outline_gitflow.drawio.svg b/documents/forGitBranch/outline_gitflow.drawio.svg deleted file mode 100644 index 23d13d53..00000000 --- a/documents/forGitBranch/outline_gitflow.drawio.svg +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - -
-
-
- main -
-
-
-
- - main - -
-
- - - - - -
-
-
- hotfix -
-
-
-
- - hotfix - -
-
- - - - - - - - - - - - -
-
-
- develop -
-
-
-
- - develop - -
-
- - - - - - - - -
-
-
- feature -
-
-
-
- - feature - -
-
- - - - -
-
-
- Tag: 1.0.0 -
-
-
-
- - Tag: 1.0.0 - -
-
- - - - - -
-
-
- Tag: 1.1.0 -
-
-
-
- - Tag: 1.1.0 - -
-
- - - - - -
-
-
- Tag: 1.0.1 -
-
-
-
- - Tag: 1.0.1 - -
-
- - - - - -
-
-
- release -
-
-
-
- - release - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- Tag: 1.2.0 -
-
-
-
- - Tag: 1.2.0 - -
-
- - - - - - - - - -
-
-
- リリース後の重大なバグ修正 -
-
-
-
- - リリース後の重大なバグ修正 - -
-
- - - - -
-
-
- 1.1.0に向けた開発 -
-
-
-
- - 1.1.0に向けた開発 - -
-
- - - - -
-
-
- 1.2.0に向けた開発 -
-
-
-
- - 1.2.0に向けた開発 - -
-
- - - - -
-
-
- 1.1.0に向けた -
- リリースブランチ -
-
-
-
- - 1.1.0に向けた... - -
-
- - - - -
-
-
- リリースブランチ作成後の -
- バグ修正はリリースブランチでおこなう -
-
-
-
- - リリースブランチ作成後の -バグ修正はリリースブランチでおこなう - -
-
- - - - -
-
-
- バグ修正した内容を値都度developに取り込む -
-
-
-
- - バグ修正した内容を値都度developに取り込む - -
-
-
- - - - - Text is not SVG - cannot display - - - -