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.

Sign up for GitHub

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

Jump to bottom

Feature Request: Do not trade same files as merge conflict #231

Open
CSchoch opened this issue Feb 3, 2023 · 2 comments
Open

Feature Request: Do not trade same files as merge conflict #231

CSchoch opened this issue Feb 3, 2023 · 2 comments

Comments

@CSchoch
Copy link

CSchoch commented Feb 3, 2023

Im using the recursive feature and my submodules sometimes contain the same dependencies since they are copied to the root path this will result in Merge conflict in import "PeruTest" at "./": even if the files are from the same commit.

Can you add a switch which ignores files which are copied multiple times but match exactly.
@byb121
Copy link

byb121 commented May 24, 2023

I suffered the same issue. @CSchoch Have you found a workaround?

@CSchoch
Copy link
Author

CSchoch commented Jul 20, 2023

No unfortunately not

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@CSchoch @byb121