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 }}
ai-driven-dev
framework
Repository navigation
Code
Issues
68
(68)
Pull requests
19
(19)
Discussions
Actions
Projects
Security and quality
Insights
More
items
feat(aidd-vcs): add conflict resolution skill
- #747
#747
Merged
blafourcade
merged 6 commits into
next
ai-driven-dev/framework:next
from
codex/resolve-conflict-skill
ai-driven-dev/framework:codex/resolve-conflict-skill
Copy head branch name to clipboard
Oct 12, 2026
Conversation
Commits
6
(6)
Checks
Files changed
Merged
feat(aidd-vcs): add conflict resolution skill
#747
blafourcade
merged 6 commits into
next
ai-driven-dev/framework:next
from
codex/resolve-conflict-skill
ai-driven-dev/framework:codex/resolve-conflict-skill
Copy head branch name to clipboard
Commits
Commits on Sep 21, 2026
feat(aidd-vcs): add conflict resolution skill
Show description for 45cba67
2 people
authored and
blafourcade
committed
45cba67
View commit details
Copy full SHA for 45cba67
Browse repository at this point
Commits on Sep 30, 2026
fix(aidd-refine): prioritize removal and concise improve instructions
alexsoyes
committed
7fb4af8
View commit details
Copy full SHA for 7fb4af8
Browse repository at this point
fix(aidd-vcs): validate conflict resolution on current next
Show description for 1f45a93
alexsoyes
committed
1f45a93
View commit details
Copy full SHA for 1f45a93
Browse repository at this point
chore(vcs): integrate concurrent branch changes
alexsoyes
committed
f482473
View commit details
Copy full SHA for f482473
Browse repository at this point
Commits on Oct 6, 2026
chore(vcs): remove unrelated changes from conflict skill PR
alexsoyes
committed
3b76238
View commit details
Copy full SHA for 3b76238
Browse repository at this point
Commits on Oct 9, 2026
fix(aidd-vcs): preserve changes during conflict resolution
alexsoyes
committed
0f2e555
View commit details
Copy full SHA for 0f2e555
Browse repository at this point
You can’t perform that action at this time.
