Core module (psm1, manifest, build, install, etc)=> my changes win
LogRhythm/Admin => your changes win
New integrations you wrote (RF, etc) = should be no conflict, otherwise yours win
Misc. LR commands outside of Admin => need to carefully compare to merge
I know you had some changes for the configuration file and perhaps some other things - you should be able to merge those in after this big merge. I don't recall there being anything like that when we merged you to dev.
Ya, there's gonna be conflicts.
Some thoughts on how to approach:
I know you had some changes for the configuration file and perhaps some other things - you should be able to merge those in after this big merge. I don't recall there being anything like that when we merged you to dev.