This PR adds the ability to merge the currentVersion property for the XCVersionGroup dictionary. If both branches have diverged from base, then it fails.
This doesn't fix all problems, because often the conflict is that both versions have diverged from base. To fix this, some sort of manual merge or selection mechanism should be introduced in order to allow the user to select which they'd prefer: mine or theirs. (For the time being, my personal version has been modified to always select theirs and prints a message warning me about it. This at least allows mergepbx to do the the rest of the merge and allows me to fix it if it's not what I wanted.)
Partially addresses #26.
This PR adds the ability to merge the currentVersion property for the XCVersionGroup dictionary. If both branches have diverged from base, then it fails.
This doesn't fix all problems, because often the conflict is that both versions have diverged from base. To fix this, some sort of manual merge or selection mechanism should be introduced in order to allow the user to select which they'd prefer: mine or theirs. (For the time being, my personal version has been modified to always select
theirsand prints a message warning me about it. This at least allows mergepbx to do the the rest of the merge and allows me to fix it if it's not what I wanted.)