You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

175 lines
7.1 KiB

  1. 0. (gitea) create repo
  2. 1. (gitea) create branch 'develop' from master
  3. 2. (gitea) set branch 'develop' as default branch
  4. 3. (gitea) enable branch protection with option 'disable push' for branch 'master'
  5. 4. (gitea) enable branch protection with option 'disable push' for branch 'develop'
  6. 5. (local) clone repo
  7. 6. (gitea) create branch 'feat-a' from develop
  8. 7. (local) get branch 'feat-a', add files, push and delete branch
  9. $ git fetch -p && git branch -a
  10. $ git checkout feat-a
  11. add file a
  12. $ git add .
  13. $ git commit -m "feat: add a file"
  14. $ git push && git checkout develop && git branch -D feat-a
  15. 8. (gitea) create pull request with 'merge into: develop' ... 'pull from: feat-a'
  16. 9. (gitea) merge this pull request with mode 'rebase and merge (--no-ff)'
  17. 10. (gitea) delete branch 'feat-a'
  18. ----
  19. 11. (gitea) create branch 'feat-b' from develop
  20. 12. (local) get branch 'feat-b', add files, push and delete branch
  21. $ git fetch -p && git branch -a
  22. $ git checkout feat-b
  23. add file b0
  24. $ git add .
  25. $ git commit -m "feat: add b0 file"
  26. add file b1
  27. $ git add .
  28. $ git commit -m "feat: add b1 file"
  29. $ git push && git checkout develop && git branch -D feat-b
  30. 13. (gitea) create pull request with 'merge into: develop' ... 'pull from: feat-b'
  31. 14. (gitea) if displayed 'update branch'
  32. 15. (gitea) merge this pull request with mode 'rebase and merge (--no-ff)'
  33. 16. (gitea) delete branch 'feat-b'
  34. ----
  35. 17. (gitea) create branch 'release-1' from develop
  36. 18. (local) get branch 'release-1', add release info, push and delete branch
  37. $ git fetch -p && git branch -a
  38. $ git checkout release-1
  39. add file release
  40. $ git add .
  41. $ git commit -m "chore: update release info"
  42. $ git push && git checkout develop && git branch -D release-1
  43. 19. (gitea) create pull request with 'merge into: develop' ... 'pull from: release-1'
  44. 20. (gitea) merge this pull request with mode 'rebase and merge'
  45. 21. (gitea) DO NOT delete branch 'release-1'
  46. 22. (gitea) create pull request with 'merge into: master' ... 'pull from: release-1'
  47. 23. (gitea) merge this pull request with mode 'merge pull request'
  48. 24. (gitea) delete branch 'release-1'
  49. ----
  50. 25. (gitea) create branch 'feat-c' from develop
  51. 26. (gitea) create branch 'feat-d' from develop
  52. 27. (local) get all new branches
  53. $ git fetch -p && git branch -a
  54. 28. (local) checkout branch 'feat-c', add files and push branch
  55. $ git checkout feat-c
  56. add file c0
  57. $ git add .
  58. $ git commit -m "feat: add c0 file"
  59. $ git push
  60. ----
  61. 29. (local) create shared file with entry for feat-c
  62. $ git checkout -b create-shared develop
  63. add shared file
  64. $ git add .
  65. $ git commit -m "feat: update shared"
  66. 30. (local) push and delete branch
  67. $ git push -u origin create-shared && git checkout develop && git branch -D create-shared
  68. 31. (gitea) create pull request with 'merge into: develop' ... 'pull from: create-shared'
  69. 32. (gitea) merge this pull request with mode 'rebase and merge'
  70. 33. (gitea) delete branch 'create-shared'
  71. 34. (gitea) create pull request with 'merge into: develop' ... 'pull from: feat-c'
  72. 35. (gitea) ONLY 'update branch'
  73. 36. (local) pull shared file to feat-c
  74. $ git checkout feat-c
  75. $ git pull
  76. ----
  77. 37. (local) add file to branch 'feat-c'
  78. $ git checkout feat-c
  79. add file c1
  80. $ git add .
  81. $ git commit -m "feat: add c1 file"
  82. $ git push
  83. ----
  84. 38. (local) checkout branch 'feat-d', add files, push and delete branch
  85. $ git checkout feat-d
  86. add file d
  87. $ git add .
  88. $ git commit -m "feat: add d file"
  89. $ git push && git checkout develop && git branch -D feat-d
  90. 39. (gitea) create pull request with 'merge into: develop' ... 'pull from: feat-d'
  91. 40. (gitea) if displayed 'update branch'
  92. 41. (gitea) merge this pull request with mode 'rebase and merge (--no-ff)'
  93. 42. (gitea) delete branch 'feat-d'
  94. ----
  95. 43. (gitea) create branch 'release-2' from develop
  96. 44. (local) get branch 'release-2', add release info, push and delete branch
  97. $ git fetch -p && git branch -a
  98. $ git checkout release-2
  99. update file release
  100. $ git add .
  101. $ git commit -m "chore: update release info"
  102. $ git push && git checkout develop && git branch -D release-2
  103. 45. (gitea) create pull request with 'merge into: develop' ... 'pull from: release-2'
  104. 46. (gitea) merge this pull request with mode 'rebase and merge'
  105. 47. (gitea) DO NOT delete branch 'release-2'
  106. 48. (gitea) create pull request with 'merge into: master' ... 'pull from: release-2'
  107. 49. (gitea) DO NOT 'update branch'
  108. 50. (gitea) merge this pull request with mode 'merge pull request'
  109. 51. (gitea) delete branch 'release-2'
  110. ----
  111. 52. (local) checkout branch 'feat-c', add files, push and delete branch
  112. $ git checkout feat-c
  113. add file c2
  114. $ git add .
  115. $ git commit -m "feat: add c2 file"
  116. add file c3
  117. $ git add .
  118. $ git commit -m "feat: add c3 file"
  119. $ git push && git checkout develop && git branch -D feat-c
  120. 53. (gitea) go to pull request 'feat-c'
  121. 54. (gitea) if displayed 'update branch'
  122. 55. (gitea) merge this pull request with mode 'rebase and merge (--no-ff)'
  123. 56. (gitea) delete branch 'feat-c'
  124. ----
  125. 57. (gitea) create branch 'feat-e' from develop
  126. 58. (local) get branch 'feat-e', add files and push branch
  127. $ git fetch -p && git branch -a
  128. $ git checkout feat-e
  129. add file e0
  130. $ git add .
  131. $ git commit -m "feat: add e0 file"
  132. $ git push
  133. ----
  134. 59. (local) create shared file with entry for feat-e
  135. $ git checkout -b update-shared develop
  136. add shared file
  137. $ git add .
  138. $ git commit -m "feat: update shared"
  139. 60. (local) push and delete branch
  140. $ git push -u origin update-shared && git checkout develop && git branch -D update-shared
  141. 61. (gitea) create pull request with 'merge into: develop' ... 'pull from: update-shared'
  142. 62. (gitea) merge this pull request with mode 'rebase and merge'
  143. 63. (gitea) delete branch 'update-shared'
  144. 64. (gitea) create pull request with 'merge into: develop' ... 'pull from: feat-e'
  145. 65. (gitea) ONLY 'update branch'
  146. 66. (local) pull shared file to feat-e
  147. $ git checkout feat-e
  148. $ git pull
  149. ----
  150. 67. (local) add file to branch 'feat-e', push and delete branch
  151. $ git checkout feat-e
  152. add file e1
  153. $ git add .
  154. $ git commit -m "feat: add e1 file"
  155. $ git push && git checkout develop && git branch -D feat-e
  156. 68. (gitea) go to pull request 'feat-e'
  157. 69. (gitea) if displayed 'update branch'
  158. 70. (gitea) merge this pull request with mode 'rebase and merge (--no-ff)'
  159. 71. (gitea) delete branch 'feat-e'
  160. ----
  161. 72. (gitea) create branch 'release-3' from develop
  162. 73. (local) get branch 'release-3', add release info, push and delete branch
  163. $ git fetch -p && git branch -a
  164. $ git checkout release-3
  165. update file release
  166. $ git add .
  167. $ git commit -m "chore: update release info"
  168. $ git push && git checkout develop && git branch -D release-3
  169. 74. (gitea) create pull request with 'merge into: develop' ... 'pull from: release-3'
  170. 75. (gitea) merge this pull request with mode 'rebase and merge'
  171. 76. (gitea) DO NOT delete branch 'release-3'
  172. 77. (gitea) create pull request with 'merge into: master' ... 'pull from: release-3'
  173. 78. (gitea) DO NOT 'update branch'
  174. 79. (gitea) merge this pull request with mode 'merge pull request'
  175. 80. (gitea) delete branch 'release-3'