diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-22 16:19:17 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-22 17:52:31 -0700 |
| commit | b8575221b19bf0a77319318a505a27c00e33e375 (patch) | |
| tree | bab508e90ab88546f230bf53f9c98c1d3a2ae46a /templatelayout.h | |
| parent | fe0864be601064e1662802eb520f6c5e61f6a87c (diff) | |
| download | subsurface-b8575221b19bf0a77319318a505a27c00e33e375.tar.gz | |
Cloud storage: use merge options to avoid conflicts
In many cases Subsurface will do something "reasonable" if we have
conflicting edits and then try to merge. GIT_MERGE_FILE_FAVOR_UNION means
that both edits will be added to the final file and then Subsurface should
quietly take one or the other - this will need quite a bit of testing.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'templatelayout.h')
0 files changed, 0 insertions, 0 deletions