diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-20 22:23:12 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-22 17:52:31 -0700 |
| commit | fe0864be601064e1662802eb520f6c5e61f6a87c (patch) | |
| tree | ab0e66204e1fb25ed4b7377ab7189bb106f96029 /qtserialbluetooth.cpp | |
| parent | ccd2cb25020e62f37fbf15dcc8b6eccbd643b7f0 (diff) | |
| download | subsurface-fe0864be601064e1662802eb520f6c5e61f6a87c.tar.gz | |
Cloud storage: merge local and remote changes if there is no conflict
We still punt if there are any conflicts (which are likely to occur if we
have touched dive sites in both changes). But in my testing at least for
fairly simple, non-conflicting changes this works and creates a correctly
merged tree.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qtserialbluetooth.cpp')
0 files changed, 0 insertions, 0 deletions