-
Notifications
You must be signed in to change notification settings - Fork 516
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[maestro] Rearrange lines to try to have fewer merge conflicts. #20984
Conversation
The `MicrosoftDotNetXHarnessiOSSharedPackageVersion` value is bumped in `main`, while `MicrosoftDotNetCecilPackageVersion` is bumped in `netX.Y` branches. If both lines are next to eachother, and they've each been updated in their respective branches, then merging `main` into `netX.Y` will result in a merge failure. Merge conflicts get old rather fast, so try to avoid this by rearranging these lines a bit.
This comment has been minimized.
This comment has been minimized.
💻 [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻✅ All tests on macOS X64 - Mac Sonoma (14) passed. Pipeline on Agent |
✅ API diff for current PR / commitLegacy Xamarin (No breaking changes)
NET (empty diffs)
✅ API diff vs stableLegacy Xamarin (No breaking changes).NET (No breaking changes)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
💻 [CI Build] Tests on macOS M1 - Mac Ventura (13) passed 💻✅ All tests on macOS M1 - Mac Ventura (13) passed. Pipeline on Agent |
💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed 💻✅ All tests on macOS M1 - Mac Big Sur (11) passed. Pipeline on Agent |
💻 [CI Build] Tests on macOS M1 - Mac Monterey (12) passed 💻✅ All tests on macOS M1 - Mac Monterey (12) passed. Pipeline on Agent |
💻 [CI Build] Windows Integration Tests passed 💻✅ All Windows Integration Tests passed. Pipeline on Agent |
This comment has been minimized.
This comment has been minimized.
🚀 [CI Build] Test results 🚀Test results✅ All tests passed on VSTS: test results. 🎉 All 168 tests passed 🎉 Tests counts✅ cecil: All 1 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
The
MicrosoftDotNetXHarnessiOSSharedPackageVersion
value is bumped inmain
,while
MicrosoftDotNetCecilPackageVersion
is bumped innetX.Y
branches.If both lines are next to eachother, and they've each been updated in their
respective branches, then merging
main
intonetX.Y
will result in a mergefailure.
Merge conflicts get old rather fast, so try to avoid this by rearranging these
lines a bit.