sbt-assembly icon indicating copy to clipboard operation
sbt-assembly copied to clipboard

Merge error not comprehensible

Open staeff777 opened this issue 2 years ago • 3 comments

I'm receiving a merge error which I cannot which I cannot assign to any source.

Do you have any advice how to narrow down the problem?

[error] 1 error(s) were encountered during the merge:
[error] java.lang.RuntimeException: 
[error] Deduplicate found different file contents in the following:
[error]   Project name = myproject, target = 
[error]   Project name = myproject, target = 
[error]   Project name = myproject, target = 
[error]   Project name = myproject, target = 

sbt assembly version: 2.1.0 sbt version: 1.8.2

staeff777 avatar Feb 03 '23 15:02 staeff777

@staeff777 Do you have a repro steps that we can use to reproduce this issue on our machines?

eed3si9n avatar Feb 03 '23 17:02 eed3si9n

It happend during a scala 2.12->3 mirgration. I hoped that this might give you a clue for me.

I'll investigate deeper and try to create a minimal example.

staeff777 avatar Feb 06 '23 08:02 staeff777

Sorry for the long delay. I finally found the source.

I had a ./lib folder in the project root, with just some native libraries. No extra references in the build.sbt. It was historically used for unmanaged jars, but meanwhile all are managed.

This caused the error. I renamed the lib-folder and everything works fine.

staeff777 avatar Mar 31 '23 08:03 staeff777