git backend: actually update local cache from remote

[Robert C. Helling]

On 11 Jun 2015, at 20:25, Dirk Hohndel <dirk at hohndel.org> wrote:

Dirk,

> So you are our posterchild for then implementing merging :-)

that may be way beyond my powers. But I promise I will think about this and try to come up with something. Somehow, we might make use of the fact that our files have more structure than just line numbers, namely they are xml fields. 

One somehow simple way do deal with conflicts would be to try to be as clever as possible with the three way merge and if that fails work on a “per dive” basis, i.e. just have the both versions of the dive show up in the dive list (maybe marked somehow) and let the user figure it out.

Given that dives in the git format are files (or actually directories), what happens when in one version a dive is modified and in a separate version it is deleted? Is that detected as a conflict? (probably) How should we present that?

Best
Robert

--                                                                              
.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO 
Robert C. Helling     Elite Master Course Theoretical and Mathematical Physics  
                      Scientific Coordinator                                   
                      Ludwig Maximilians Universitaet Muenchen, Dept. Physik    
print "Just another   Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339       
    stupid .sig\n";   http://www.atdotde.de 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150611/0e238413/attachment.sig>