Skip to content

Merge v2.9.2 into Pharo14 produces a conflict #958

@Ducasse

Description

@Ducasse
 git merge v2.9.2                                                              [19:50:38]
Auto-merging src/BaselineOfMicrodown/BaselineOfMicrodown.class.st
Auto-merging src/Microdown-Blog-Tests/MicBridge.class.st
CONFLICT (content): Merge conflict in src/Microdown-Blog-Tests/MicBridge.class.st
Automatic merge failed; fix conflicts and then commit the result.

I do not really understand why there is a conflict. So I will wait for some help.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions