Skip to content
Navigation Menu
Sign in
Products
Platform
GitHub
Repository hosting, code review, and collaboration
Copilot
AI coding agent for tasks, projects and automated work
Build & Ship
Actions
CI/CD and automation
Code Quality
Quality analysis, fixes, and enforcement
Codespaces
Cloud development environments
Secure
Code Security
Vulnerability detection and remediation
Secret Protection
Secret scanning and leak prevention
All Features
Developers
Learn
Documentation
Training
Certifications
Build
Build with Copilot
Customize Copilot
Integrations
Explore
Trending repos
GitHub Sponsors
Events
Changelog
Changelog
Your source for the latest features, improvements, and fixes across GitHub products, all in one place.
Businesses
By Stage
Enterprises
Team
Startups
Nonprofits
By Industry
Healthcare
Financial services
Manufacturing
Government
See all industries
Evaluate GitHub
Why GitHub
Customer Stories
Business insights
Trust Center
Add-ons
GitHub Advanced Security
Enterprise-grade code security
Copilot for business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Resources
Learn & Connect
Documentation
Resource center
Blog
Events & webinars
Community Forum
Customer Stories
Integrations
Support
Customer support
Training
GitHub Status
Company
About
Partners
Changelog
GitHub Universe
GitHub Universe
The event for developers, by developers — talks, workshops, and what’s next for GitHub.
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 }}
QuantStack
git2cpp
Repository navigation
Code
Issues
8
(8)
Pull requests
2
(2)
Actions
Projects
Security and quality
Insights
More
items
Merge conflict
- #57
#57
Closed
SandrineP
wants to merge 2 commits into
QuantStack:main
QuantStack/git2cpp:main
from
SandrineP:merge_conflict
SandrineP/git2cpp:merge_conflict
Copy head branch name to clipboard
Conversation
Commits
2
(2)
Checks
Files changed
Closed
Merge conflict
#57
SandrineP
wants to merge 2 commits into
QuantStack:main
QuantStack/git2cpp:main
from
SandrineP:merge_conflict
SandrineP/git2cpp:merge_conflict
Copy head branch name to clipboard
Commits
Commits on Oct 31, 2025
Add merge commit
SandrineP
committed
1c4b6d9
View commit details
Copy full SHA for 1c4b6d9
Browse repository at this point
Commits on Dec 2, 2025
Add merge conflicts
SandrineP
committed
42a4230
View commit details
Copy full SHA for 42a4230
Browse repository at this point
You can’t perform that action at this time.