The Git Flow model uses long-lived stable and develop branches alongside short-lived feature branches to structure collaborative work.
Use the `git add -p` command to interactively stage specific parts of a file, creating clean, single-purpose commits.
The `git commit --amend` command allows you to add staged changes to the most recent commit, effectively rewriting it.
Use `git rebase` to move a feature branch onto the latest commit of its base branch, maintaining a linear history.
An interactive rebase (`git rebase -i`) allows you to stop at a specific commit in your history to edit, amend, and then continue.
Create `fixup!` commits that target older commits and then use `git rebase -i --autosquash` to automatically merge them in.
The speaker answers audience questions about prioritizing comments, the risks of rebasing shared branches, and writing effective commit messages.
tree-IT GmbH
Bad Neustadt an der Saale, Germany
Hubert Burda Media
München, Germany
47:42Roberth Strand
26:46Gerrit Stapper
08:38Omar Gallo
38:14Daniel Siegl
33:23Jonathan Creamer
29:49Lian Li
45:58Thomas Schütz
45:28Julien Delange
Jobs that call for the skills explored in this talk.
DRK-Blutspendedienst Baden-Württemberg – Hessen gGmbH
Mannheim, Germany
gematik GmbH
Berlin, Germany
LINEAR Gesellschaft für konstruktives Design mbH
Aachen, Germany
BVU Beratergruppe Verkehr + Umwelt GmbH
Freiburg im Breisgau, Germany
SVA System Vertrieb Alexander GmbH
Langenhagen, Germany
SVA System Vertrieb Alexander GmbH
Bensheim, Germany
