Conflict Resolution - Allow both open at same time
I'm currently presented with the following conflict:
http://i.imgur.com/SyfrA.jpg
I don't know which file this applies to. There is not enough information given and the columns don't expand or scroll. In any case, it would be useful to be able to open both files so that I could manually copy the highlighting/annotations missing from one PDF to the other.
http://i.imgur.com/SyfrA.jpg
I don't know which file this applies to. There is not enough information given and the columns don't expand or scroll. In any case, it would be useful to be able to open both files so that I could manually copy the highlighting/annotations missing from one PDF to the other.
-
dstillmanUnfortunately under the hood it's not quite as easy as adding buttons, because the remote file hasn't been downloaded yet at that point, but we may be able to rig something up to download the remote file to a temporary directory. I've created an issue for this.