Skip to content

Commit

Permalink
docs: gitflow workflow simplified
Browse files Browse the repository at this point in the history
  • Loading branch information
marrip committed Feb 27, 2024
1 parent 764e39a commit 7916d99
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,16 @@ A two-day workshop for bioinformaticians and molecular biologists with focus on

---

### Branching strategy - Gitflow
## 2. Development & Collaboration

### Branching model: Gitflow

- start with two branches to record project history: `main` and `develop`
- each new feature resides in its own branch (feature branch)
- feature branch is generally created off latest `develop` commit
- upon feature completion, feature branch is merged into `develop`

![](img/gitflow01.png)

---

Expand Down

0 comments on commit 7916d99

Please sign in to comment.