Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge error not comprehensible #492

Open
staeff777 opened this issue Feb 3, 2023 · 3 comments
Open

Merge error not comprehensible #492

staeff777 opened this issue Feb 3, 2023 · 3 comments

Comments

@staeff777
Copy link

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

@eed3si9n
Copy link
Member

eed3si9n commented Feb 3, 2023

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

@staeff777
Copy link
Author

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
Copy link
Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants