cotalks.dev

Conflicts 101 for engineers: 3 things you should know about conflicts

(link)
note