Explain Git merge workflow issue for PR #1570 - #1589
Closed
davidjbradshaw with Copilot wants to merge 1 commit into
Closed
Explain Git merge workflow issue for PR #1570#1589davidjbradshaw with Copilot wants to merge 1 commit into
davidjbradshaw with Copilot wants to merge 1 commit into
Conversation
Copilot
AI
changed the title
[WIP] Refactor iframe-resizer monorepo structure into smaller modules
Explain Git merge workflow issue for PR #1570
Feb 11, 2026
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
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.
User manually resolved merge conflicts between
devandmasterbranches following GitHub's standard workflow, but GitHub still shows conflicts. No code changes were made in this PR - only provided explanation via comment.Root Cause
The merge commit created locally was not successfully pushed to the remote
devbranch. The PR head remains at commit266b767("Hopefully fix merge issues") without the merge commit that resolves conflicts.Response Provided
Explained that:
devbranchgit push -u origin dev) likely executed on wrong branch or failedorigin devNo code modifications were necessary - this was a Git workflow issue requiring local repository operations outside agent scope.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.