The Watercooler Squad is an important place for all things unimportant and nonsense at daily.dev. It’s designed to waste your time and distract you, buckle up 😻 🤹🏽‍♀️

Watercooler

Learn about different git strategies, optimizing workflow, and best practices for using branches.

show me your git strategies

me, when people say they don’t like rebase
<img src="https://media.daily.dev/image/upload/s--UgAiTPyE--/f_auto/v1710860112/ugc/content_1e38a60e-f2e6-4964-8acf-2bff4f856690" alt="7ke4as2rb9pc1">

I’m chaotic good: rebase and fast-forward merge 🤣

Squash and merge
Plus: Auto-merge after all tests passed 😍

I honestly just use GitHub Desktop because I only ever need Git for cloning repositories and pulling/pushing commits.