Skip to content

Commit

Permalink
fix: add delete new branch after merge to figures
Browse files Browse the repository at this point in the history
  • Loading branch information
signekb committed Oct 27, 2023
1 parent b2c9466 commit 5db226d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
Binary file modified entries/images/branching-parallel-development.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions entries/images/branching-parallel-development.puml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"Dev 1\nbugfix/fix-data-cleaning-error" -> "Dev 1\nbugfix/fix-data-cleaning-error": Dev 1 adds and/or changes\nfiles to fix error in data cleaning
"Dev 2\nfeature/add-variance-plot" -> "Dev 2\nfeature/add-variance-plot": Dev 2 adds and/or changes\nfiles to create variance plot
"Dev 1\nbugfix/fix-data-cleaning-error" -> "Main branch": After PR and review,\nchanges are merged into main
"Dev 1\nbugfix/fix-data-cleaning-error" -> "Dev 1\nbugfix/fix-data-cleaning-error" !! : Delete
"Dev 2\nfeature/add-variance-plot" -> "Main branch": After PR and review,\nchanges are merged into main
"Dev 2\nfeature/add-variance-plot" -> "Dev 2\nfeature/add-variance-plot" !! : Delete

@enduml
Binary file modified entries/images/branching-simple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions entries/images/branching-simple.puml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"Main branch" -> "New branch": Create new branch from main
"New branch" -> "New branch": Add and/or change files\n
"New branch" -> "Main branch": After PR and review, merge\nnew branch into main branch
"New branch" -> "New branch" !! : Delete


@enduml

0 comments on commit 5db226d

Please sign in to comment.