Thank you. This sounds like a great approach! I’ve also been surprised at the mechanical nature that git resolves conflicts in, and the loss of intent when auto-merging.
I've worked in 3 companies with the classic Silicon Valley starter pack consisting of Slack, GitHub (not part of Office 365), and GSuite, and found it overall pretty good! What features did you find missing? Personally I shudder at the thought of using SharePoint, it's the worst designed product I've seen.