Merging changes
When working on a shared project in a team, it may happen that the same files are edited by several users simultaneously. To save such changes from being overwritten, MetaEditor features the function for merging data.
If you try to save a file that has already been changed by someone to the storage, MetaEditor prompts you to get the latest changes first. When the changes are received, an attempt is made to merge the data: changes from the storage are applied to the local data copy and an attempt is made to save the current local changes.
|
Sample merging
Let's consider a typical case of merging two files. As mentioned above, during merging, source code files are compared line by line. If a file in the storage contains the lines that are not present in the local file, these lines are added. Consider the following example of merging two files:
After you click 
Update from Storage, the local files remain unchanged, since local changes are of higher priority. If the storage file had contained the new line "x=0;", it would have been added, while "return(true);" line would have remained unchanged:
|