URC Conflict Resolution Not Resolving Conflicts with Self

Summary

I use two computers, one for UEFN and a different one for UEFN and my digital content creation tools.

One of my projects is saying that I can not sync to latest because “Some of your changes conflict with the latest snapshot of the project” When I attempt to resolve the conflict, the ‘Resolve Conflicts’ button does nothing, resetting the panel to its’ previous unedited state.

Please select what you are reporting on:

Unreal Editor for Fortnite

What Type of Bug are you experiencing?

Unreal Revision Control

Steps to Reproduce

  1. Have one account that operates on two computers

  2. Make edit on one computer

  3. Sync on the second computer

  4. Conflicts show up

  5. Hit the buttons to use “All Theirs”

  6. Hit “resolve conflicts” button

Expected Result

The project uses the selected version of the conflicting files.

Observed Result

The “resolve conflicts” button greys out, the conflicted files stay up and reset to look unselected. It looks the same as when you started.

Platform(s)

Windows 11

It started working again :smiley: