Questions tagged [merge-conflict]

My app uses CoreData + CloudKit synchronization. Some CoreData entities like Item can be shared via iCloud's shared database. The app uses only 1 NSPersistentContainer, but it has 2 NSManagedContexts, the visualContext and a backgroundContext. Thus…

In Sourcetree, when merging results in conflicts, the conflicted files are automatically added to the commit message, like this Is this also possible with Gitkraken?

I'm using Visual Studio 2022 as my external diff and merge tool in SourceTree. When I encounter a merge conflict and Visual Studio's merge view opens, I'm immediately prompted to save the file. I can't interact with the merge view, and the only…