Weekly update:
What do we do when a bug fix is tied into a branch that someone else is working on?
(1) If critical/blocking, extract bug fix and land separately, and then return to the main branch
(2) If not critical, simply have a pre-implementation call with person doing the main work to prevent duplication of work. Similarly, if you are working on a task, double-check that at least your face is on the card