I had the following conflict: Path conflict: path1/file / path2/file
I tried resolving by: bzr resolve path2/file --take-this
which gave me bzr: ERROR: bzrlib.errors.InvalidEntryName: Invalid entry name: path1/file
Crash file is attached.
I had the following conflict:
Path conflict: path1/file / path2/file
I tried resolving by:
bzr resolve path2/file --take-this
which gave me errors. InvalidEntryNam e: Invalid entry name: path1/file
bzr: ERROR: bzrlib.
Crash file is attached.