search

ProjectBorealis / PBSync

System for syncing Unreal Engine project git repositories
MIT License
79 stars 8 forks source link

Add support for UE4Editor merge resolution workflow #4

Open mastercoms opened 4 years ago

mastercoms commented 4 years ago

Git repo now configured properly for UE4Editor to detect a conflict and prompt for a resolution. However, we block launches from happening when a merge conflict is encountered. Thus, we should investigate the UE4Editor workflow for this, and confirm everything is working smoothly. It may require creating a custom mergetool for git (to replace the default p4merge.exe in UE4Editor, which isn't found in path).

mastercoms commented 3 years ago

Partially fixed in fc39d279c210ee92a848002a3f81ac88e8bd68f1. Still need to unblock launches when a merge conflict is present.