Keep both conflict #9915
Merged
Keep both conflict #9915
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
JammingBen
reviewed
Nov 7, 2023
|
Kudos, SonarCloud Quality Gate passed!
|
JammingBen
approved these changes
Nov 9, 2023
12 tasks
AlexAndBear
pushed a commit
that referenced
this pull request
Dec 13, 2023
* keep both conflict fix * keep both conflict cleanup * added changelog, keep both conflict * fixed changelog, keep both conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
In case of /folder/folder where result should be /folder/folder (1) to resolve conflict, regex updated URL to /folder(1)/folder
Related Issue
Types of changes
Checklist: