Johannes Haux
Git for Code Reviews
#1about 2 minutes
Understanding the Git Flow branching model
The Git Flow model uses long-lived stable and develop branches alongside short-lived feature branches to structure collaborative work.
#2about 6 minutes
Staging parts of a file for atomic commits
Use the `git add -p` command to interactively stage specific parts of a file, creating clean, single-purpose commits.
#3about 3 minutes
Updating the latest commit with git amend
The `git commit --amend` command allows you to add staged changes to the most recent commit, effectively rewriting it.
#4about 2 minutes
Updating a branch with git rebase
Use `git rebase` to move a feature branch onto the latest commit of its base branch, maintaining a linear history.
#5about 2 minutes
Modifying older commits with interactive rebase
An interactive rebase (`git rebase -i`) allows you to stop at a specific commit in your history to edit, amend, and then continue.
#6about 3 minutes
Using fixup commits and autosquash for easier edits
Create `fixup!` commits that target older commits and then use `git rebase -i --autosquash` to automatically merge them in.
#7about 4 minutes
Q&A on code review tools and git best practices
The speaker answers audience questions about prioritizing comments, the risks of rebasing shared branches, and writing effective commit messages.
Related jobs
Jobs that call for the skills explored in this talk.
Matching moments
14:52 MIN
Deconstructing the overloaded git commit command
Coffee with Developers - Scott Chacon on growing GitButler and the future of version control
04:44 MIN
The asynchronous code review workflow in practice
Are Code Reviews Worth It? Insights from 16 Years of Review Data
03:21 MIN
Using Git as the single source of truth
Everything as Code: A Dozen As-Code Concepts beyond Infrastructure or Configuration as Code
07:58 MIN
Core principles of a Git-centric workflow
GitOps keeps focus on apps, not on infrastructure
26:04 MIN
Q&A on merge vs rebase and writing commit messages
Ask Your Code
22:22 MIN
Using Git and GitHub for version control
#90DaysOfDevOps - The DevOps Learning Journey
05:15 MIN
The workflow of an automated code review process
Build a CI/CD pipeline to automate code reviews and ensure code quality
00:19 MIN
Introduction to GitOps and the talk agenda
Get ready for operations by pull requests
Featured Partners
Related Videos
26:46Keep your code refactorable
Gerrit Stapper
33:17Ask Your Code
Scott Chacon
08:38Conventional commits vs gitmoji
Omar Gallo
26:35How to Optimize Non-Coding Time
Yishai Beeri
23:44Are Code Reviews Worth It? Insights from 16 Years of Review Data
Sven Amann
29:35GitHub Copilot Beyond the Basics - 10 Ways to Elevate Your Coding
Liuba Gonta & Yuliya Khadasevich
33:23How a Small Team Shrank a Microsoft Monorepo by 94%
Jonathan Creamer
29:49GitOps for the people
Lian Li
Related Articles
View all articles
From learning to earning
Jobs that call for the skills explored in this talk.
DevOps Engineer Continuous Integration and Deployment (m/w/d) | PLSCNS
Atruvia AG
Berlin, Germany
Intermediate
Senior
GIT
Jenkins
DevOps Engineer - Kubernetes (w/m/d)
smartclip Europe GmbH
Hamburg, Germany
Intermediate
Senior
GIT
Linux
Python
Kubernetes
Full-Stack Developer
Friedrich Kicherer GmbH & Co. KG
Ellwangen (Jagst), Germany
Junior
Intermediate
Senior
GIT
Docker
JavaScript
* Starke Python-Kenntnisse (sauberer, testbarer Code; Git-/Code-Reviews)
Axpo Gruppe
GIT
Machine Learning
Continuous Integration
Software Entwickler / Full Stack Developer
Sector Nord AG
Oldenburg, Germany
Intermediate
Senior
Docker
InfluxDB
(Senior) DevOps/Cloud Engineer with Google Cloud Experience (all genders) - 100 % Remote
iits-consulting GmbH
Munich, Germany
Intermediate
Go
Docker
DevOps
Kubernetes
Senior Angular Developer (m/w/d)
autoiXpert GmbH & Co. KG
Stuttgart, Germany
Senior
Node.js
Angular
MongoDB
TypeScript