◐/

BROWSE108 notes

Filter notes/

Enter opens the top match. Use /regex/i for patterns.

▸Software Enginner1

▸Kubernetes16

▸GitHub Actions15

Fix bugs or Add features docker system prune curl API testing: repeat 100×, load & timing Install .deb files & alternative install methods (Ubuntu)

⌂Home ◐Search◎Graph

DOMAIN

DOMAIN

Git

4 of 24

Procedurelast month

Resolve a merge conflict

Git stops and asks you to decide when the same lines were changed on both sides. Here's the sequence that gets you out cleanly.

Commandlast month

git branch & switch

Branches are cheap, disposable pointers to a commit. Create one per feature or fix and switch between them freely.

Commandlast month

Combines another branch's changes into your current branch, preserving both branches' history as-is.

Commandlast month

Replays your branch's commits on top of another branch's tip, producing linear history instead of a merge commit.

Git · Knowledge & Memory Center