Resolving merge conflicts

stephensamonte / Unreal-Virtual-University

Learning Unreal Engine by creating a game that takes place at VT

1 stars 0 forks source link

Closed stephensamonte closed 5 years ago

stephensamonte commented 5 years ago

Resolving merge conflicts.

Example: Conflicting files.

Useful links:

stephensamonte commented 5 years ago

Resolved.

To resolve conflict click on open in GitHub Desktop. Its a straightforward process.

stephensamonte commented 5 years ago

GitPlugin in beta for Unreal Engine 4. This allows viewing scripts in Unreal 4 to resolving script conflicts.: https://github.com/SRombauts/UE4GitPlugin