Merge integration with BeyondCompare is not working, showing only 2 way diff, not 3 way

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows

450 stars 10 forks source link

Merge integration with BeyondCompare is not working, showing only 2 way diff, not 3 way #2209

Closed doneykoo closed 1 month ago

doneykoo commented 2 months ago

Fork 1.95.0.0 Windows
BeyondCompare Version 4.4.7 (build 28397) Windows

DanPristupov commented 2 months ago

Does it work for other files?

doneykoo commented 2 months ago

update: tried new BC 5.0.0 beta, it's working.

doneykoo commented 2 months ago

Does it work for other files?

Here in my case, it occurs for all other files that conflicts, which are typescript (*.ts). Not sure yet for other projects, or for other types. I'll update info if I see it.

doneykoo commented 1 month ago

hi @DanPristupov got an update, sorry for bothering: It seems the problem is that the BeyondCompare4 pro license has expired. I'll contact our IT to solve this.