Resolve conflicts between apps in Matlab

willCommit.m

tic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%                             -+= Welcome =+-
% This script was created by Ori Hauptman from Israel.
%
% Because of the way Matlab Apps are saved, it's hard and sometimes
% even not possible to resolve conflicts with Git.
%
% Run this script every time before commiting your changes to Git
% to create a folder for each of your apps, so you can reslove
% the conflicts in there.
%
% After you resolve the conflicts you can make a zip archive
% from your app's folder and change it's name to end with '.mlapp' to
% bring it back to be an app.
%%%%%%%%%
% Configurations - supports file/folder path
appsPaths =         ["MyFolder/MyApp.mlapp",    "MySecondFolder/MySecApp.mlapp"       ];
extractionFolders = ["MyFolder/My Application", "MySecondFolder/My Second Application"];

tempCopy = fullfile(tempdir, "appcopy.zip"); % Will be temporary created to extract the app into folder

allowNonMatlabApps = false; % Set to 'true' to ignore files that does not end with the file extension '.mlapp'.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

if length(appsPaths) ~= length(extractionFolders)
    error("Wrong configurations." + newline + "Please make sure that the names of each of your apps that you just specified match the name of the folder that will be created.")
    return;
end

for i = 1:length(appsPaths)
    
    delete(tempCopy);

    folder = extractionFolders(i);
    [directory, filename, fileextension] = fileparts(appsPaths(i));
    disp("Working on " + string(filename) + "...")
    assert(string(fileextension) == ".mlapp" || allowNonMatlabApps, "One of the files specified on 'appsPaths' does not have a valid Matlab Application extension (should end with .mlapp)." + newline + "If this is intentionally, set 'allowNonMatlabApps' to true.")
    filename = string(filename) + string(fileextension);
    
    deleteFolder(folder);
    
    copyfile(appsPaths(i), tempCopy);
    
    unzip(tempCopy, folder);
    
end

delete(tempCopy);

disp("Done in " + round(toc,2) + "s! you can now commit your changes.")

function deleteFolder(path)
    if ~isfolder(path)
      return;
    end
    filePattern = fullfile(path, '*');
    theFiles = dir(filePattern);
    for k = 3 : length(theFiles)
      baseFileName = theFiles(k).name;
      fullFileName = fullfile(path, baseFileName);
      if isfolder(fullFileName)
          deleteFolder(fullFileName);
      else
        delete(fullFileName);
      end
    end
    
    rmdir(path);
    
end

If you have any questions feel free to ask 😄

Updated the script to support file/folder paths
Also, I added a warning when trying to specify file with non-Matlab App extension.