Hello, I'm trying to do a remote-URL/remote-URL merge (for vendor drops) into my working copy which contains externals (for the binaries). When both are updated to HEAD and I try to do the merge, I get this error message. I've tried using --force, but that seems to work once, but subsequently the merge will still fail with the same error. I've resorted to explicitly updating my external to the same revision as the rest of the WC before merge proceeds.
Is there a cleaner way around this or am I doing something wrong? Regards, Joel
