History and Branches
This is a step-by-step Git·GitOps exercise regarding change history and branches.
-

[Git and GitOps 09] Resolve Conflicts with the Common Ancestor and a Three-Way Merge
Read conflict markers, compare both changes against their common ancestor and verify the result before completing a merge.
-

[Git and GitOps 08] Create and Merge Branches: switch and Fast-Forward
Create branches, switch between lines of work and inspect the difference between fast-forward and merge commits.
-

[Git and GitOps 07] Choose restore, reset or revert Before Undoing Changes
Choose an undo command based on whether changes are uncommitted, committed locally or already shared with others.
-

[Git and GitOps 06] Read History with HEAD, Graphs, diff and bisect
Inspect commit relationships and HEAD, compare changes and understand how bisect narrows a regression to a commit.
-

[Git and GitOps 05] Make a First Commit with add, commit, status and diff
Follow changes through the working tree, staging area and commit history, checking each step with status and diff.