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 }}
Hacks4Snacks
/
tmforge
Public
Notifications
You must be signed in to change notification settings
Fork
0
Star
0
Code
Issues
0
Pull requests
2
Discussions
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Discussions
Actions
Projects
Security and quality
Insights
feat: Semantic diff and three-way merge for .tm7 deconfliction
- #17
#17
Merged
Hacks4Snacks
merged 5 commits into
main
Hacks4Snacks/tmforge:main
from
hacks4snacks/gitdeconfliction
Hacks4Snacks/tmforge:hacks4snacks/gitdeconfliction
Copy head branch name to clipboard
Jul 7, 2026
Conversation
Commits
5
(5)
Checks
Files changed
Merged
feat: Semantic diff and three-way merge for .tm7 deconfliction
#17
Hacks4Snacks
merged 5 commits into
main
Hacks4Snacks/tmforge:main
from
hacks4snacks/gitdeconfliction
Hacks4Snacks/tmforge:hacks4snacks/gitdeconfliction
Copy head branch name to clipboard
Commits
Commits on Jul 7, 2026
diff support
Hacks4Snacks
committed
31ddb57
View commit details
Copy full SHA for 31ddb57
Browse repository at this point
diff build fixes
Hacks4Snacks
committed
8561926
View commit details
Copy full SHA for 8561926
Browse repository at this point
wrap up cli git diff and merge support
Hacks4Snacks
committed
54e5e72
View commit details
Copy full SHA for 54e5e72
Browse repository at this point
3-way and 2-way merge support via studio UI
Hacks4Snacks
committed
76b6568
View commit details
Copy full SHA for 76b6568
Browse repository at this point
enrich the open file buttons to match the rest of the app
Hacks4Snacks
committed
2951c92
View commit details
Copy full SHA for 2951c92
Browse repository at this point
You can’t perform that action at this time.
