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 }}
cryptomator
/
cryptofs
Public
Notifications
You must be signed in to change notification settings
Fork
37
Star
109
Code
Issues
12
Pull requests
4
Actions
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Security and quality
Insights
Feature: Improve conflict resolution
- #356
#356
Merged
infeo
merged 3 commits into
develop
cryptomator/cryptofs:develop
from
feature/355-improve-conflict-resolution
cryptomator/cryptofs:feature/355-improve-conflict-resolution
Copy head branch name to clipboard
Aug 12, 2026
Conversation
Commits
3
(3)
Checks
Files changed
Merged
Feature: Improve conflict resolution
#356
infeo
merged 3 commits into
develop
cryptomator/cryptofs:develop
from
feature/355-improve-conflict-resolution
cryptomator/cryptofs:feature/355-improve-conflict-resolution
Copy head branch name to clipboard
Commits
Commits on Aug 6, 2026
fixes #355
infeo
committed
14d2033
View commit details
Copy full SHA for 14d2033
Browse repository at this point
add unit tests
infeo
committed
355be01
View commit details
Copy full SHA for 355be01
Browse repository at this point
Commits on Aug 7, 2026
only resolve directory conflicts if dirId is complete
infeo
committed
1d13ffd
View commit details
Copy full SHA for 1d13ffd
Browse repository at this point
You can’t perform that action at this time.
