Merge Conflicts Python Packages

git-imerge

Incremental merge for git

mergefix

AI-powered git merge conflict resolver — resolve conflicts in seconds with Claude, OpenAI, or Ollama

xunique

merge Xcode project file is so easy