Sounds like many commenters here haven't used Office 365 and may have outdated ideas of what Office is capable of these days (it ain't Office 2010).
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.
Yep! I think Microsoft lulled people into a false sense that they weren't doing anything with Office, while the Google suite gradually gained features (and to be fair, does 90% of what a normal person would ever do with documents). But it turned out they were busy making every feature in Office work in the collaborative environment, with versioning. It's incredibly impressive, and I am not a natural fan of Microsoft. It doesn't work as well as Google with a crappy or nonexistent Internet connection, but in your typical office environment it's great. I think people will be really surprised at how easily you can do things like assemble slides for a collaborative presentation. Sharing with people outside the organization requires a Microsoft account of some kind (either institutional or your old Xbox Live or Minecraft account) but that's about it. A high fraction of everything can be done in the browser, so it's easier than ever to have a Linux desktop. Plus have you see they have LateX equations now?
Syncdocs https://www.syncdocs.com/ is a tool that lets multiple Microsoft Office and Google Docs users collaborate in real-time on the same document. It uses Google Docs for versioning.
Yep, this is why as a pragmatist, I'm all about "reviewing my priors" from time to time. Things change, constraints change, and we need to constantly update our views.
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.
You can actually do a sort-of pull request: suggested changes. When editing mode of the document is set to "reviewing" then your changes would appear as sidebar suggestions which the owner can accept or reject.
The above is true, but there are caveats. Under the hood, Office is constantly saving back to Sharepoint and trying to merge changes. If it can't merge changes it will simply alert the user and give the option of abandoning their changes or saving them locally for manual merge later.
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.
That’s interesting——I regularly collaborate with 30+ users and have yet to see a merge conflict.
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.
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.