File-per-Actor Version Control Pipeline. How?

Hello friends!

Can anyone share proper approach on how to work with version control while using file per actor?

Here is the example case:
We have two branches DEVELOP and New Map Design .
New Map Design - has changes to the map.
DEVELOP - has fresh new features.
We want new features from DEVELOP to be in New Map Design .
We merge DEVELOP in to New Map Design .
All blueprints merges nicely. BUT Map become a mess.
Since its a File-Per-Actor , those actors on the map that weren’t changed - stay the same. Actors that were deleted from the map - gets added back (from develop branch), other actors gets deleted.
Everything goes without conflicts. Cuz its not a conflict technically.

QUESTION: How can changes to blueprints can be merged in to New Map Design without affecting the map? Thanks!

1 Like