Of course one can't do a pull request with Office (non-geeks would struggle with the idea anyway) but live-editing of shared documents and version history is now built-in.
If two or more people open the same .docx/.pptx/.xlsx from a shared environment (Sharepoint/Teams/OneDrive), and then proceed click on Open in Desktop App (the browser-based apps are unpolished IMO), AutoSave is automatically turned on, and they're automatically thrown into live collaboration mode. This is the new norm in most enterprises that have Office365.
Most office folks require version history rather than version control -- not many are likely to need to branch, merge, pull, push -- and Office365 definitely supports the former. You can even have a threaded conversation about the changes in the document itself. -- when you add a comment, the chat sidebar opens. The back-and-forth comments are stored in the document.
Note: this is different from "Track Changes" in older version of office -- which still exists but is more for visual diffing. Version history only stores snapshots.
I lived through the days of Microsoft being predatory and evil and I hated Microsoft because their products sucked (not sure if anyone remembers the strident rhetoric in comp.os.os2.advocacy -- that newsgroup raised Microsoft hatred into an art form). For years this emotional response blinded me to the pockets of genuinely good technology that Microsoft had in its lineup (like SQL Server).
When I started working in an enterprise environment, I often ended doing things the hard way because of this blind spot of resisting anything Microsoft. It cost me so much.
It was only when I was forced to put aside my prejudices that I discovered that it was actually possible to be productive while using Microsoft tech. Nowadays I favor pragmatism and productivity over partisanship, and try to choose the best tool for the job, and if it means choosing MS tools occasionally, that's ok.
In my experience, merging seems to fail more often with Excel and PowerPoint than Word, but even in Word applying doc-wide changes (e.g. change of language) while someone else edits usually fails.
For sequential editing it works fine and keeps an automatic version history.
Is it possible you’re using a older version of Sharepoint that isn’t collaboration aware? I know in older versions of Sharepoint, documents get checked out and locked all the time. Are you able to do live editing? If you aren’t, we might talking about different versions here.
With Office 365 and Sharepoint 2016, I was under the impression that collaboration uses operational transformations (like Google Docs) or CRDTs rather than continuous merging —- which isn’t feasible for real-time live editing anyway. Unresolvable conflicts are rare because the merge is happening at the action level, not document level.
The experience in Office 365 has been similar to Google Suite for me.
The only caveat I'd offer is, for MS Word specifically, you can have: (1) Large complex documents (i.e. lots of links/references, sections) OR (2) Many collaborators. Pick ONE. If you must have both of these, leave track changes off, and use highlights and comments.
I've been in the unfortunate position of being next to a deadline, where the word document was the key deliverable. And then having that document become corrupted. Fairly certain it was a confluence of the above factors that caused it. If the doc is starting to take 30 seconds or more to just scroll down or edit one character, that's your first warning bell.
We tried opening in Word Online, Word Mac, Word Windows and even LibreOffice. No dice. What worked in the end? A smart chap on our team thought to try importing the doc into Google Docs, and then exporting it again...
We regularly edit complex documents with large numbers of collaborators. Track changes and collaboration are different though (the former has been around since time immemorial but collaboration only came out a couple of years ago)
I get that they're headed towards WebKit for all their apps, but it's kind of frustrating to have to head to outlook.com for some things and have to use the desktop version for others (though the search via outlook.com is vastly improved over the desktop versions of Outlook).
My $0.02: just use git?
Sounds good in theory - now imagine explaining to a group of regular office workers concept of commits, merges, pull requests, whole workflow and additional software for doing all of this. It's just not possible.