You are here

3 posts / 0 new
Last post
Merge Libraries Conflict #1
elln's picture
by elln
January 23, 2014 - 1:04pm

Hi, I just started sharing a library with someone else. We both work and make changes on it. I import and merge the library he has worked on so to integrate any changes and additions. But when a conflict emerges, when we both have made changes on the same file, I am asked by aperture to choose one library to resolve the conflict. My question is, is there a way I can find the list of these conflicts when they emerge? Obviously aperture knows exactly what they are. How can I reveal this?

Thank you

Ellen

Walter Rowe's picture
by Walter Rowe
January 23, 2014 - 7:40pm

Unfortunately no. And you can’t merge both sets of changes together either. You are forced to decide who’s changes will be saved and who’s will be lost. You will have to negotiate / coordinate who is making changes to which images. If the other person only needs subsets of images at a time, perhaps exporting that subset for them and you not touching them during that time period would help eliminate that issue. It would be nice to see what changes were applied by each person, and to be able to merge both when they are not overlapping (e.g. you changed some things and they changed others that do not conflict with yours).

smb's picture
by smb
February 6, 2014 - 3:45pm

Walter,

What if a duplicate project was created at the outset, and one person worked on Project A and the other worked on Project B. They would both be working on the same original files and could check back and forth also see adjustments, etc.

Stan
sbysshe.smugmug.com

You may login with either your assigned username or your e-mail address.
Passwords are case-sensitive - Forgot your password?
randomness