Microdown icon indicating copy to clipboard operation
Microdown copied to clipboard

Merge v2.9.2 into Pharo14 produces a conflict

Open Ducasse opened this issue 6 months ago • 0 comments

 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.

Ducasse avatar Aug 05 '25 17:08 Ducasse