Michal Ševčenko

3-way merge - correct output of CONFLICT_PRODUCES_MERGE_CONFLICT

2

**Describe the bug** I suspect CONFLICT_PRODUCES_MERGE_CONFLICT does not produce correct output. **To Reproduce** Steps to reproduce the behavior: 1. Example data BASE Imagine there's no heaven LEFT Imagine there's no...

3-way merge - context

4

Trying to generate three-way merge using diff and applyTo. Is there a functionality to require a context between adjacent modifications? This would be reported as a conflict by git diff,...

Magicline plugin does not work correctly with widgets

5

## Type of report Bug ## Provide detailed reproduction steps (if any) 1. Create document containing at least one widget, and any block element at the document end, may be...

import/export directives ignored when not at the start of line

2

When debugging problems with unresolved import paths, it turned out that parsing import directives is triggered only when the directive actually starts the line: JsFileRegexParser:347 (in version 20220601) ``` if...

Tomcat 10 version

2

Any chance to upgrade devloader to Tomcat 10 (jakarta API). The last version I have is DevLoaderTomcat85.jar, which also works fine in Tomcat 9. In 10, it obviously fails with...

### Discussed in https://github.com/swagger-api/swagger-codegen/discussions/12428 In the following settings of an operation: ```yaml security: - petstore_auth: - write:pets - read:pets ``` it seems that only scheme name is retrieved, and the...