Resolve list of updated (and existing) files between two branches