Search found 1 match
- Fri Jan 10, 2025 10:05 am
- Forum: Source Control
- Topic: Upgraded to MC 2024, now all pulled commits are marked as conflicts?
- Replies: 0
- Views: 32408
Upgraded to MC 2024, now all pulled commits are marked as conflicts?
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 ...