conatuscreative/boxer — pull request #22 by TravisEvashkevich (2014-05-20 12:01:23+00:00)
Title: Merge Feature

Turned off Folder Moving for now cause it has a big weird bug in it.

**_How To Use Merge:_**
**1.** Merge via the menu (or Ctrl M)
**2.** select the file you'd like to merge
--Checks if the files binary are different then continues if it is
--Will find any Folders that don't exist in your current document and any images that are different then current
**3.** Presents with window containing new things and differences
--new content on left, Changed content on right (this means if anything has changed such as points etc. it will be on the right)
**4.** If you choose **"Keep"** on the Changed Content then it will immediately overwrite your data in the file.
Choosing Keep on New Content will add it to a "Merged" folder in the base document so you can move images from there (yes unfortunately till we can fix the Folder moving bug you'll have to make a new folder where you want it in the hierarchy, hope to fix soon)