Summary
git
workflows are not so different from each other, and most are built on top of others. It is more important to follow the principles of fail fast and roll forward instead of treating a certain workflow like a dogma. All workflows are just a collection of best practices, and you should only take what you need.
What is important is the size of your changes and the frequency in which you merge them back.
Always follow these rules:
- Always branch your topic branches of the main branch (trunk-based).
- If you're working on complex features, make sure to commit at least once per day (using feature flags).
- If your changes are simple and you only need to change a few lines of code, you can leave your PR open for a longer time. But check that you don't have too many open PRs.
With these rules, the workflow you are actually using is not so important. Pick the things that work for you.
In this chapter, you learned about the benefits of TBD and...