A look at Git commands visualized using building blocks.
Merge in a branch (feat/c) that builds on the commits in your current branch (main).
feat/c
main
Bring your branch (feat/d) up to date while keeping your changes on top.
feat/d
Create a new merge commit that brings two diverged branches together.