A developer shares a branchless Git workflow where all work-in-progress features live on the local master branch simultaneously. Instead of creating feature branches, changes are intermixed freely and later reorganized using git rebase into clean, self-contained patchsets before submission. The approach eliminates time spent creating/switching branches, ensures all features remain mutually applicable to master, and lets upstream conflicts be resolved across all workstreams at once. git add -p and git commit -p help separate interleaved changes, while git send-email is used for patch submission. Branches are only used for very large, long-running workstreams.

5m read timeFrom drewdevault.com
Post cover image

Sort: