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 }}
cssu
mini-git
Repository navigation
Code
Issues
12
(12)
Pull requests
4
(4)
Actions
Projects
Security and quality
Insights
More
items
Feat/three way merge
- #50
#50
Merged
aman-a-shah
merged 5 commits into
main
cssu/mini-git:main
from
feat/three-way-merge
cssu/mini-git:feat/three-way-merge
Copy head branch name to clipboard
Oct 13, 2026
Conversation
Commits
5
(5)
Checks
Files changed
Merged
Feat/three way merge
#50
aman-a-shah
merged 5 commits into
main
cssu/mini-git:main
from
feat/three-way-merge
cssu/mini-git:feat/three-way-merge
Copy head branch name to clipboard
Commits
Commits on Oct 13, 2026
Add three-way merge and conflict resolution.
DanisLol
committed
47a0aae
View commit details
Copy full SHA for 47a0aae
Browse repository at this point
Fix merge CLI test to switch branches before checkout.
DanisLol
committed
59035e2
View commit details
Copy full SHA for 59035e2
Browse repository at this point
Integrate Myers diff and packed storage with three-way merging
aman-a-shah
committed
f7f7df8
View commit details
Copy full SHA for f7f7df8
Browse repository at this point
Use Myers edits and preserve explicit conflict resolutions across CLI calls
aman-a-shah
committed
b3e5dd5
View commit details
Copy full SHA for b3e5dd5
Browse repository at this point
Integrate validated push conflict detection with three-way merging
aman-a-shah
committed
c7d2006
View commit details
Copy full SHA for c7d2006
Browse repository at this point
You can’t perform that action at this time.
