Improve update-skia merge conflict guidance#3662
Open
mattleibow wants to merge 2 commits intomainfrom
Open
Conversation
📦 Try the packages from this PRWarning Do not run these scripts without first reviewing the code in this PR. Step 1 — Download the packages bash / macOS / Linux: curl -fsSL https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.sh | bash -s -- 3662PowerShell / Windows: iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 3662"Step 2 — Add the local NuGet source dotnet nuget add source ~/.skiasharp/hives/pr-3662/packages --name skiasharp-pr-3662More options
Or download manually from Azure Pipelines — look for the Remove the source when you're done: dotnet nuget remove source skiasharp-pr-3662 |
Add mandatory 'git log skiasharp -- <file>' step before resolving any merge conflict. This prevents silently overwriting intentional fork patches with upstream code. Adds gotcha #15 documenting the m133 iOS GL file incident where --theirs replaced a deliberate dlsym(RTLD_DEFAULT) patch with an upstream macOS-only OpenGL.framework path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mattleibow
force-pushed
the
dev/improve-merge-conflict-guidance
branch
from
858b227 to
afc8cf2
Compare
|
📖 Documentation Preview The documentation for this PR has been deployed and is available at: 🔗 View Staging Site This preview will be updated automatically when you push new commits to this PR. This comment is automatically updated by the documentation staging workflow. |
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
1 participant
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.
Summary
Adds a mandatory
git log skiasharp -- <file>step before resolving merge conflicts during Skia milestone updates.Motivation
During the m133 update,
src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cppwas resolved withgit checkout --theirs, silently overwriting an intentional iOS fork patch (commit ef484fb377) that replaced upstream's macOS-onlydlopenpath withdlsym(RTLD_DEFAULT). The skill's conflict resolution table had no guidance for non-C-API upstream source files.Changes
SKILL.md (Phase 4)
git log --oneline skiasharp -- <file>before resolving any conflictknown-gotchas.md