Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
Appearance settings
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
Uh oh!
There was an error while loading.
Please reload this page
.
github
/
gh-aw
Public
Notifications
You must be signed in to change notification settings
Fork
541
Star
5.1k
Code
Issues
404
Pull requests
2
Discussions
Actions
Projects
Wiki
Security and quality
10
Insights
Additional navigation options
Code
Issues
Pull requests
Discussions
Actions
Projects
Wiki
Security and quality
Insights
Fall back to unsigned push instead of failing when a rebase hits a genuine merge conflict in
pushSignedCommits
- #56568
#56568
Open
dsyme
with
Copilot
wants to merge 10 commits into
main
github/gh-aw:main
from
copilot/resolve-merge-conflict
github/gh-aw:copilot/resolve-merge-conflict
Copy head branch name to clipboard
Conversation
Commits
10
(10)
Checks
Findings
Files changed
Open
Fall back to unsigned push instead of failing when a rebase hits a genuine merge conflict in
pushSignedCommits
#56568
dsyme
with
Copilot
wants to merge 10 commits into
main
github/gh-aw:main
from
copilot/resolve-merge-conflict
github/gh-aw:copilot/resolve-merge-conflict
Copy head branch name to clipboard
Commits
Commits on Aug 28, 2026
Initial plan
Copilot
authored
255c218
View commit details
Copy full SHA for 255c218
Browse repository at this point
Fall back to unsigned push on genuine rebase conflict in pushSignedCommits
Show description for d041ed5
Copilot
and
dsyme
authored
d041ed5
View commit details
Copy full SHA for d041ed5
Browse repository at this point
Merge branch 'main' into copilot/resolve-merge-conflict
github-actions[bot]
authored
195de1f
View commit details
Copy full SHA for 195de1f
Browse repository at this point
Surface combined error when unsigned push fallback is rejected (e.g. branch protection)
Show description for 8819b83
Copilot
and
gh-aw-bot
authored
8819b83
View commit details
Copy full SHA for 8819b83
Browse repository at this point
Route genuine-conflict fallback through preflight checks; make abort failure fatal
Show description for a5f0498
Copilot
and
gh-aw-bot
authored
a5f0498
View commit details
Copy full SHA for a5f0498
Browse repository at this point
Route post-backfill genuine conflict through the same unsigned-push fallback
Show description for 8ed42f9
Copilot
and
gh-aw-bot
authored
8ed42f9
View commit details
Copy full SHA for 8ed42f9
Browse repository at this point
Commits on Aug 29, 2026
Merge branch 'main' into copilot/resolve-merge-conflict
github-actions[bot]
authored
8ab960c
View commit details
Copy full SHA for 8ab960c
Browse repository at this point
Merge remote-tracking branch 'origin/main' into copilot/resolve-merge-conflict
Show description for 95681c0
Copilot
authored
95681c0
View commit details
Copy full SHA for 95681c0
Browse repository at this point
Commits on Sep 8, 2026
Merge branch 'main' into copilot/resolve-merge-conflict
dsyme
authored
3323e7d
View commit details
Copy full SHA for 3323e7d
Browse repository at this point
Apply remaining changes
Show description for f6a3d6b
Copilot
and
dsyme
authored
f6a3d6b
View commit details
Copy full SHA for f6a3d6b
Browse repository at this point
You can’t perform that action at this time.