what's the best practice for merge newer UE4 code into the modified one by our dev?

We have modified many picec of the ue4, when new version coming,which way to merge them more better?