Upgraded to MC 2024, now all pulled commits are marked as conflicts?

This forum is for all Flare issues related to using Source Control.
Post Reply
anevers
Jr. Propeller Head
Posts: 1
Joined: Mon Dec 16, 2024 9:06 am

Upgraded to MC 2024, now all pulled commits are marked as conflicts?

Post by anevers »

I have upgraded my MC to 2024 to begin testing for my coworkers, they are still on 2022. We use git for source control as well, and now every time i pull any changes down, even when I havent made any, every file I pull is marked as a conflict with changes on local and remote. Checking the Merge tool, any file i select the entire thing is marked as green and Added, on both the local and remote file. Even though, again, i have made no changes, and the pulled file should only have a few lines marked as new.

Im not sure if this is a MC or git issue, Ive looked around on the forums and cant find much similar, I've tried changing git configurations, but no luck. Any help appreciated.
Post Reply