We have a team in web development project and we've decided to go with a single repository with its pros and cons. We have our backlog split up into Jira stories and every story has several FE and BE tasks. Like:
ABC-1 Display cats
1.1. ABC-2 [FE] Display cats markup
1.2. ABC-3 [FE] Send CRUD requests for cats
1.3. ABC-4 [BE] Create CRUD endpoints for cats
The question is should we create a single branch abc-1-display-cats and put FE+BE commits in it and then merge it into dev branch, OR should we create small abc-2-display-cats-markup, abc-4-create-crud-endpoints-cats branches for each sub-task and then merge every small branch into dev ?
Branch per feature
undo 1 merge commit
Branch per subtask
You can create a feature branch like abc-1-display-cats branch from dev branch. For each of the subtask create a new branch abc-4-create-crud-endpoints-cats from the feature branch abc-1-display-cats and merge it back to the same feature branch. dev branch will interact only with feature branch, so you can perform rollback of whole feature. Also each developer can work independently on its subtask branch.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With