Home ▶Image Scope Merging

# Image Scope Conflict Resolution for VCSs

With Mercurial and Git, when your changes for an image create a conflict, you can resolve this much in the same way you would for text. Kaleidoscope's mergetool capabilities allow you to resolve these conflicts.

Be sure you have set Kaleidoscope as your mergetool via the Integration menu for your source control management system:

Go to Kaleidoscope > Integration...

### Resolve Image Conflicts

Use ksdiff integration settings configured for Git or Mercurial to send your merge conflicts to Kaleidoscope

1. Send to Kaleidoscope via your `ksdiff` settings
2. Review differences in Image Scope.
3. Choose which to keep using the image conflict tools on the bottom toolbar.
4. Save your changes by closing the comparison.
5. Finish up and confirm your changes in the Terminal.