Skip to content

Instantly share code, notes, and snippets.

@trico

trico/t.rb

Created December 20, 2018 12:53
Show Gist options
  • Save trico/0388b4be82a338f88f2a82ed03820396 to your computer and use it in GitHub Desktop.
Save trico/0388b4be82a338f88f2a82ed03820396 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
t.rb
+-------------------+ +---------------------+
| Master | | Staging |
| | | |
+-------------------+ +---------------------+
Rama A | |
+----------------------+ |
| | |
+ | |
Commit ID 1 | |
+ | |
| | |
| | |
+ | |
Commit ID 2 | |
+ | |
| | |
+ | |
Commit ID 3 | |
+ | |
+--------------------->+
Squash solo +-------------------> Commit ID 1
se genera un commit | +
Commit id 50 + | |
+ | |
Bot detecta el hotfix | +
usa la rama A para hacer PR +-------------------> Commit ID 2
+ | +
| | +
| +-------------------> Commit ID 3
+ +
Commit ID 3 Nue^o hotfix |
+----------------------+ |
| | Commit ID 50 no existe en |
| | staging!! se arrastra!! |
+----------------------+ |
| +-------------------------->+
+ | |
Bot detecta el hotfix +-Commit ID 3-------------->+
++
|
|
+
En el PR del último HF del Bot
aparecen cambios que ya deberían
estar en staging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment