Git Together: Merge, Rebase, and Conflicts
What to do when a teammate changes the same files: fetch, merge or rebase, and resolve conflicts with confidence.
3 items
Talks
Git Basics: Share Your First Change
The everyday Git workflow for writers: save changes on your computer, share them on GitLab, and get them reviewed, practiced on a real example.
Find the friction: How I built SparkFlow with AI
How I noticed a friction in working with AI agents, and used context, components, and criteria to have an agent build the fix.