-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
76 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
@startuml branching-parallel-development | ||
|
||
"Main branch" -> "Dev 1\nbugfix/fix-data-cleaning-error": Dev 1 creates a new branch\nto fix data cleaning error | ||
"Main branch" -> "Dev 2\nfeature/add-variance-plot": Dev 2 creates a new branch\nto create a variance plot | ||
"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 2\nfeature/add-variance-plot" -> "Main branch": After PR and review,\nchanges are merged into main | ||
|
||
@enduml |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
@startuml branching-simple | ||
|
||
"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 | ||
|
||
@enduml |