On Sun, Jun 29, 2014 at 10:35:46AM +0200, Willem Ferguson wrote: > On 29/06/2014 00:43, Dirk Hohndel wrote: > >On Sat, Jun 28, 2014 at 06:37:09PM +0200, Willem Ferguson wrote: > >>Updates to user manual : Load photographs > >Strangely this didn't apply. I manually made this work but I wonder why > >your tree and my tree (i.e., master) are out of sync... > > > >/D > >_______________________________________________ > >subsurface mailing list > >[email protected] > >http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface > > > I pulled a new version of Subsurface, but had my previous copy on which I > did the edits. > Since the new pull did not yet reflect my latest edits to the manual, I did > the edits > on my own previous version and not within the latest pull. > > Will try and be more systematic in future.
No worries, it wasn't something that I couldn't deal with - I just simply worry when I notice things like this as it might mean that someone has commits in their tree that they haven't sent - and that causes potential problems. This tends to be much more of an issue for people adding features / writing code. For the manual the merging usually isn't too bad. /D _______________________________________________ subsurface mailing list [email protected] http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
