> On Jun 14, 2015, at 1:55 PM, Tomaz Canabrava <[email protected]> wrote: > > Grace, always do a rebase from master so your work is not hard to merge later. > I'm doing the review right now.
Linus might disagree with that :-) In general I don't mind if you keep working on your branch without rebasing. Especially if you follow my request to have many small commits I'd much rather be able to see your work and merge it myself... It may make sense at some point to rebase: a) when I pulled your work so far and you want to make sure your future work is on top of that b) when you need a feature / a change that was made in master /D > On Sun, Jun 14, 2015 at 10:51 AM, Grace Karanja <[email protected] > <mailto:[email protected]>> wrote: > Hello everyone, > > This past week, I managed to: - > > - Enhance the displaying of the dive log, grouped in trips > - Add the ability to tap on a dive and display some basic details. > > Now I am focussing on adding more details to the dive info page and > also the ability to edit and save dive details. > > Once Tomaz approves my work, I think, what I have done so far is ready > for master. > > My code is at: https://github.com/gracie89/subsurface > <https://github.com/gracie89/subsurface>, in the devel branch. > > -- > Grace K > > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
