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

streetwriters / notesnook Public

Notifications You must be signed in to change notification settings
Fork 649
Star 10.6k

Code
Issues 1.1k
Pull requests 36
Discussions
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Security
Insights

Add support for showing conflicts on locked notes#5726

Open

thecodrr wants to merge 2 commits intomasterstreetwriters/notesnook:masterfrom feature/conflict-on-locked-notesstreetwriters/notesnook:feature/conflict-on-locked-notesCopy head branch name to clipboard

+1-8

Conversation Commits2 (2)Checks Files changed

Commits

Commits on May 21, 2024

core: enable conflicts on locked notes
thecodrr
committed
web: fix conflict on locked note auto resolving
thecodrr
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.