◐/

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

TAG

#conflicts · Knowledge & Memory Center

TAG

#conflicts

1 of 1

Concept3 weeks ago

Merge vs rebase conflict strategies — ours vs theirs

"ours" and "theirs" mean opposite things depending on whether you're merging or rebasing — because rebase replays your own commits as if they were incoming patches onto a different HEAD. Every combination, in one place.