OFPA creates conflicts (Revision Control)

Summary

One file per actor, when used with external revision control and branches, it will create the same folder structure in two different branches, for different files, then when two branches are merged, it will create conflicts. I have encountered this issue many times and I 've had teammates cause conflicts to our project not knowing how to handle the conflict. We have also lost a lot of work due to one actor being replaced by another due to the conflicts created by this issue.

Please select what you are reporting on:

Unreal Editor for Fortnite

What Type of Bug are you experiencing?

Stability

Steps to Reproduce

Use a branch revision control
Create 5 branches and on each one add 3 complex prefabs (different for each branch)
All commit to their branch
Make a root branch then have all 5 merge to it (repro is made to elevate the occurrence, may still not happen though)

Expected Result

All branches merge to root without conflicts

Observed Result

One file per actor made the same folders for different branches (and potentially the same same filenames), then when merging there are conflicts that will cause one of the two files to be deleted.

Platform(s)

pc

FORT-938903 has been created and its status is ‘Unconfirmed’. This is now in a queue to be reproduced and confirmed.

@Wertandrew going to follow up with you in discord to better understand this issue as well as how you’re using branches at the moment

1 Like