3 ms·
1. Create feature branch 2. Make changes 3. Commit changes at whatever point and write a good commit message about the feature. 4. Commit more. 5. Create fe
by jmkr 5y ago
1. Create feature branch
2. Make changes
3. Commit changes at whatever point and write a good commit message about the feature.
4. Commit more.
5. Create feature/branch_rebase
6. Squash all the commits.
7. Push to fork
8. Make pull request
9. Make fixes and push those commits per fix.
10. Squash when merging back to that first commit.
I like having a separate rebase branch because then I have all my work in one branch and the history of what I did. Then I squash it and get rid of the that history, then maybe rebase main back into it if there we changes since I started the feature.