mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-03-11 08:54:48 +00:00
c1e9f45df9
* Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions) |
||
|---|---|---|
| .. | ||
| Add.cpp | ||
| Add.h | ||
| Clip.cpp | ||
| Clip.h | ||
| CMakeLists.txt | ||
| Command.cpp | ||
| Command.h | ||
| Diceware.cpp | ||
| Diceware.h | ||
| Edit.cpp | ||
| Edit.h | ||
| Estimate.cpp | ||
| Estimate.h | ||
| Extract.cpp | ||
| Extract.h | ||
| Generate.cpp | ||
| Generate.h | ||
| keepassxc-cli.1 | ||
| keepassxc-cli.cpp | ||
| List.cpp | ||
| List.h | ||
| Locate.cpp | ||
| Locate.h | ||
| Merge.cpp | ||
| Merge.h | ||
| Remove.cpp | ||
| Remove.h | ||
| Show.cpp | ||
| Show.h | ||
| Utils.cpp | ||
| Utils.h | ||