Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

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

cryptomator / cryptofs Public

Notifications You must be signed in to change notification settings
Fork 35
Star 98

Code
Issues 13
Pull requests 6
Actions
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Security
Insights

Use Conflict Suffixes from Ciphertext Files#275

Open

overheadhunter wants to merge 3 commits intodevelopcryptomator/cryptofs:developfrom feature/use-original-conflict-suffixescryptomator/cryptofs:feature/use-original-conflict-suffixesCopy head branch name to clipboard

+219-36

Conversation Commits3 (3)Checks Files changed

Commits

Commits on Feb 1, 2025

improve extraction of ciphertext from filenames
overheadhunter
committed
attempt to import conflict suffix from ciphertext
overheadhunter
committed
apply suggestion from code review
overheadhunter
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.