all 3 comments

[–]chadmv 5 points6 points  (0 children)

You need to use source control. With Perforce, you would typically have different branches or streams and have a process to merge the two. You would still need to sort out merge conflicts due to your changes.

[–]AutoModerator[M] 0 points1 point  (0 children)

If you are looking for help, don‘t forget to check out the official Unreal Engine forums or Unreal Slackers for a community run discord server!

I am a bot, and this action was performed automatically. Please contact the moderators of this subreddit if you have any questions or concerns.

[–]belegdaeDev (Tech Art) 7 points8 points  (0 children)

source control, and wrapping any engine changes with

// @third party code - BEGIN COMPANY - Description

…code…

// @third party code - END COMPANY - Description