-
Notifications
You must be signed in to change notification settings - Fork 238
Comparing changes
Open a pull request
base repository: dotnet/razor
base: b80af7180d
head repository: dotnet/razor
compare: a6fcedcc35
- 6 commits
- 0 files changed
- 4 contributors
Commits on Oct 8, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20241…
…004.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2
Configuration menu - View commit details
-
Copy full SHA for c9ea655 - Browse repository at this point
Copy the full SHA c9ea655View commit details
Commits on Oct 10, 2024
-
Update dependencies from https://github.com/dotnet/arcade build 20241…
…008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1
Configuration menu - View commit details
-
Copy full SHA for f6844fe - Browse repository at this point
Copy the full SHA f6844feView commit details
Commits on Oct 11, 2024
-
[release/dev17.8] Update dependencies from dotnet/arcade (#10984)
This pull request updates the following dependencies [marker]: <> (Begin:46887afb-6afe-4ad7-1b8f-08dcc28b24d8) ## From https://github.com/dotnet/arcade - **Subscription**: 46887afb-6afe-4ad7-1b8f-08dcc28b24d8 - **Build**: 20241008.1 - **Date Produced**: October 8, 2024 6:38:56 PM UTC - **Commit**: e5b13e054339e41d422212a0ecaf24fec20cb5a1 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24504.2 to 8.0.0-beta.24508.1][2] [2]: dotnet/arcade@103916c...e5b13e0 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates sdk.version to 8.0.110 - Updates tools.dotnet to 8.0.110 [marker]: <> (End:46887afb-6afe-4ad7-1b8f-08dcc28b24d8)
Configuration menu - View commit details
-
Copy full SHA for 7736068 - Browse repository at this point
Copy the full SHA 7736068View commit details
Commits on Oct 15, 2024
-
Merge remote-tracking branch 'upstream/release/dev17.8' into merges/r…
…elease/dev17.8-to-release/dev17.10
Configuration menu - View commit details
-
Copy full SHA for 89d7d4e - Browse repository at this point
Copy the full SHA 89d7d4eView commit details -
Merge release/dev17.8 to release/dev17.10 (#11011)
This is an automatically generated pull request from release/dev17.8 into release/dev17.10. 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.8 - https://github.com/dotnet/razor/find/release/dev17.10 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.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force ```
Configuration menu - View commit details
-
Copy full SHA for 2ea5245 - Browse repository at this point
Copy the full SHA 2ea5245View commit details -
Merge release/dev17.10 to release/dev17.11 (#11022)
This is an automatically generated pull request from release/dev17.10 into release/dev17.11. 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.10 - https://github.com/dotnet/razor/find/release/dev17.11 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.10-to-release/dev17.11 git reset --hard upstream/release/dev17.11 git merge upstream/release/dev17.10 # Fix merge conflicts git commit git push upstream merges/release/dev17.10-to-release/dev17.11 --force ```
Configuration menu - View commit details
-
Copy full SHA for a6fcedc - Browse repository at this point
Copy the full SHA a6fcedcView commit details
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 b80af7180d...a6fcedcc35