We recieved a copy of procServControl from diamond before it was available source controlled on git. due to this the two versions have diverged as we both have had changes on both, and there is no mutual git history for merging.
We should do an analysis on what has changed in both, and what should be patched over and what has been superceded and consider whether its feasible to unite the two git histories.
We recieved a copy of procServControl from diamond before it was available source controlled on git. due to this the two versions have diverged as we both have had changes on both, and there is no mutual git history for merging.
We should do an analysis on what has changed in both, and what should be patched over and what has been superceded and consider whether its feasible to unite the two git histories.
Diamond's Our's