Comments on Edit Conflict (11.x)
Last modified by Vincent Massol on 2024/02/26 17:52
Choose the export format from the list below:
Export as Portable Document Format (PDF) using the Web Browser
Export as HyperText Markup Language (HTML)
Links:
https://help.github.com/en/articles/resolving-a-merge-conflict-on-github
https://github.blog/2016-12-12-resolve-simple-merge-conflicts-on-github/
Alternatives:
https://etherpad.org/
https://cryptpad.fr/