Option to merge changes made to the same file without causing conflict

I would like a feature where plaintext files can be automatically merged. In the same or similar way, Git handles file merging.

 

Example scenario 1:

Two members of my team or working with markdown files locally, in the Dropbox folder, both users save the file creating a conflicted copy and a main copy.

Given that both members are working in different sections, and their edits do not overlap, I would like for the Dropbox sync to automatically merge the changes together instead of creating a conflicting copy. Making the user experience of collaborating seamless.

 

Example scenario 2:

Two members of my team or working with markdown files locally, in the Dropbox folder, both users save the file creating a conflicted copy and a main copy.

Both Members edit the same section of the file, meaning that an automatic merge is not possible. A Dropbox pop-up for desktop and an alert for web, states “merge conflict on save, click to resolve”. Clicking the alert opens git style diff as a temporary file in either the web editor or the system default editor, allowing the team member to manually merge the conflict, on save the changes are applied to the document.

A workflow much easier to deal with than the current conflicted file system.

 

As someone with experience with the git workflow, not having auto merging for simple text files is quite jarring. For a team that not only works directly with a lot of plain text files, but also uses lots of tools that use plain text. Specifically because of the ability of Git to automatically handle the majority of technical overhead of collaboration.

This feature in Dropbox would bring a lot of utility to our day-to-day lives.