-
Notifications
You must be signed in to change notification settings - Fork 230
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: dotnet/razor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 77e74bd705
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: dotnet/razor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 29658c14e9
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 4 commits
- 0 files changed
- 3 contributors
Commits on Aug 13, 2024
-
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
…release/dev17.11-to-release/dev17.12 * upstream/release/dev17.11: Upgrade System.Security.Cryptography.Xml to avoid CG alerts. Update System.Formats.Asn1 to address CG alert. Manually reference Microsoft.IO.Redist 6.0.1 where needed to fix CG alerts. Upgrade testing analyzers to address CG alert. Update version of system.security.cryptography.xml in use in 17.10 (#10525)
Configuration menu - View commit details
-
Copy full SHA for 80c19df - Browse repository at this point
Copy the full SHA 80c19dfView commit details -
Merge release/dev17.11 to release/dev17.12 (#10731)
This is an automatically generated pull request from release/dev17.11 into release/dev17.12. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.11 - https://github.com/dotnet/razor/find/release/dev17.12 Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.11-to-release/dev17.12 git reset --hard upstream/release/dev17.12 git merge upstream/release/dev17.11 # Fix merge conflicts git commit git push upstream merges/release/dev17.11-to-release/dev17.12 --force ```
Configuration menu - View commit details
-
Copy full SHA for 5954852 - Browse repository at this point
Copy the full SHA 5954852View commit details
Commits on Aug 14, 2024
-
Merge remote-tracking branch 'upstream/release/dev17.12' into merges/…
…release/dev17.12-to-main # Conflicts: # src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
Configuration menu - View commit details
-
Copy full SHA for ee177e5 - Browse repository at this point
Copy the full SHA ee177e5View commit details -
Merge release/dev17.12 to main (#10734)
This is an automatically generated pull request from release/dev17.12 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.12 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.12-to-main git reset --hard upstream/main git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-main --force ```
Configuration menu - View commit details
-
Copy full SHA for 29658c1 - Browse repository at this point
Copy the full SHA 29658c1View commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 77e74bd705...29658c14e9