Compare and merge functionality for save action

[rishabkaushik]

Hi,

Consider that two developers are editing the same file, the one saving at the last will overwrite the other's changes.
What I think will be a good addition to the save action is - create a diff of the three versions and give the user an option to merge the changes. This will be optional and setting driven.

I understand that this should be dealt using git and we are planning to integrate it but it will take some time with the approvals and implementation.