merge conflict shows encrypted text

Question

talespin-kit opened this issue 12 years ago · 2 comments

If the merge fails, then the merge conflict shows encrypted text with which it is not possible to resolve the conflict.

Answer 1 · 2012-09-21T01:56:29.000Z

Am new here! sounds like a show stopper?

Answer 2 · 2012-09-26T01:08:37.000Z

Encrypted repositories are not really intended to be used by multiple entities.