Skip to content

Conversation

ex0dus-0x
Copy link
Collaborator

No description provided.

@frabert frabert force-pushed the alan/symb-conflict-fixes branch from 2cf59d4 to fbca061 Compare September 12, 2025 08:32
@wizardengineer
Copy link
Collaborator

wizardengineer commented Sep 14, 2025

@frabert If I'm misunderstanding this, feel free to let me know :)

Full disclosure, I haven't tested this yet:

    if (isExternalLinkage(srcLinkage) && isExternalLinkage(dstLinkage) &&
        !srcIsDeclaration && !dstIsDeclaration) {
      return ConflictResolution::Failure;
    }

Edit:
#69 (comment) was previously a review, I accidentally deleted it after trying to make it a Single Comment instead of a review. Subsequently making it below frabert comment.

@frabert
Copy link
Collaborator

frabert commented Sep 15, 2025

@wizardengineer Sorry I think I'm missing some context... What's the question?

@frabert frabert merged commit 0fcc689 into main Sep 16, 2025
11 checks passed
@frabert frabert deleted the alan/symb-conflict-fixes branch September 16, 2025 08:20
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

Successfully merging this pull request may close these issues.

3 participants