Honestly, we have so many repositories and such high communication between work cells that merge conflicts are exceedingly rare. If someone did change somethin

Honestly, we have so many repositories and such high communication between work cells that merge conflicts are exceedingly rare. If someone did change something out from under me, I could very well see myself doing my work over on top of theirs, and a rebase may help with that, but I would certainly try to merge first. I tend to use rebase solely when I specifically want to rewrite history so as to pretend it was different than it was. Thanks for engaging and discussing!