Merge rc/1.25 into main - #4315
Merged
Merged
Conversation
Implements the specification at https://wiki.semmle.com/display/SDmaster/project-layout+format by compiling file path specifications to regular expressions.
I looked through PRs between rc/1.24 and rc/1.25 and added missing change notes for: - github#3314 - github#3302 - github#3212 - github#3453 - github#3407 - github#3563 ``` git log --grep="Merge pull request" --format=oneline rc/1.24..rc/1.25 -- python/ ```
Java: Add 1.25 change notes.
backporting fixes from `@sj`
Co-authored-by: Rasmus Wriedt Larsen <rasmuswl@github.com>
This avoids calling the path transformer for `GeneratedFile`s.
…ge-notes Python: Add missing 1.25 change notes
C#: Implement support for path transformers
tamasvajk
approved these changes
Sep 24, 2020
tamasvajk
left a comment
Contributor
There was a problem hiding this comment.
It's a bit surprising to see the java and python change notes show up in the diff, but otherwise it LGTM.
Contributor
Author
Ideally, I would like to be able to see only the merge resolution in a diff, but I don't know if that is possible. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
I had to resolve a few merge conflicts; not sure if it can be seen in the web UI, but
gitkat least shows how the conflicts were resolved.https://jenkins.internal.semmle.com/job/Changes/job/CSharp-Differences/454/