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 }}
aivanovski
keepassvault
Repository navigation
Code
Issues
11
(11)
Pull requests
2
(2)
Discussions
Actions
Projects
Security and quality
Insights
More
items
Implement 3-way merge
- #343
#343
Merged
aivanovski
merged 14 commits into
master
aivanovski/keepassvault:master
from
feature/add-merge-conflict-resolution
aivanovski/keepassvault:feature/add-merge-conflict-resolution
Copy head branch name to clipboard
Aug 17, 2026
Conversation
Commits
14
(14)
Checks
Files changed
Merged
Implement 3-way merge
#343
aivanovski
merged 14 commits into
master
aivanovski/keepassvault:master
from
feature/add-merge-conflict-resolution
aivanovski/keepassvault:feature/add-merge-conflict-resolution
Copy head branch name to clipboard
Commits
Commits on Aug 13, 2026
Implement 3-way merge; Refactor from Java to Kotlin
aivanovski
committed
1b7af17
View commit details
Copy full SHA for 1b7af17
Browse repository at this point
Commits on Aug 15, 2026
Add db migration test from version 6 to 7
aivanovski
committed
1cbc53b
View commit details
Copy full SHA for 1cbc53b
Browse repository at this point
Add temporary files clean up
aivanovski
committed
3e31954
View commit details
Copy full SHA for 3e31954
Browse repository at this point
Refactor sync conflict resolution logic
aivanovski
committed
807d41d
View commit details
Copy full SHA for 807d41d
Browse repository at this point
Fix sync logic
aivanovski
committed
e7ea6c0
View commit details
Copy full SHA for e7ea6c0
Browse repository at this point
Update AGENTS.md
aivanovski
committed
8ddb889
View commit details
Copy full SHA for 8ddb889
Browse repository at this point
Commits on Aug 16, 2026
Convert FileSystemProvider to Kotlin
aivanovski
committed
192df92
View commit details
Copy full SHA for 192df92
Browse repository at this point
Update local backup file after upload to server
aivanovski
committed
8c66fd7
View commit details
Copy full SHA for 8c66fd7
Browse repository at this point
Commits on Aug 17, 2026
Add CLAUDE.md file
aivanovski
committed
141d437
View commit details
Copy full SHA for 141d437
Browse repository at this point
Update History screen previews
aivanovski
committed
a5e3197
View commit details
Copy full SHA for a5e3197
Browse repository at this point
Add error panel to History screen
aivanovski
committed
1a38f79
View commit details
Copy full SHA for 1a38f79
Browse repository at this point
Add DiffViewer screen preview
aivanovski
committed
74cb877
View commit details
Copy full SHA for 74cb877
Browse repository at this point
Add empty diff cell to DiffViewer screen
aivanovski
committed
7b368f1
View commit details
Copy full SHA for 7b368f1
Browse repository at this point
Update version
aivanovski
committed
382e35a
View commit details
Copy full SHA for 382e35a
Browse repository at this point
You can’t perform that action at this time.
