<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jun 14, 2015, at 1:55 PM, Tomaz Canabrava <<a href="mailto:tcanabrava@kde.org" class="">tcanabrava@kde.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Grace, always do a rebase from master so your work is not hard to merge later.<div class="">I'm doing the review right now.</div></div></div></blockquote><div><br class=""></div><div>Linus might disagree with that :-)</div><div><br class=""></div><div>In general I don't mind if you keep working on your branch without rebasing.</div><div>Especially if you follow my request to have many small commits I'd much rather </div><div>be able to see your work and merge it myself...</div><div><br class=""></div><div>It may make sense at some point to rebase:</div><div>a) when I pulled your work so far and you want to make sure your future </div><div>work is on top of that</div>b) when you need a feature / a change that was made in master</div><div><br class=""></div><div>/D</div><div><br class=""></div><div><br class=""><blockquote type="cite" class=""><div class=""><div class="gmail_extra"><div class="gmail_quote">On Sun, Jun 14, 2015 at 10:51 AM, Grace Karanja <span dir="ltr" class=""><<a href="mailto:gracie.karanja89@gmail.com" target="_blank" class="">gracie.karanja89@gmail.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class="">Hello everyone,<div class=""><br class=""></div><div class="">This past week, I managed to: - </div><div class=""><br class=""></div><div class=""> - Enhance the displaying of the dive log, grouped in trips</div><div class=""> - Add the ability to tap on a dive and display some basic details.</div><div class=""><br class=""></div><div class="">Now I am focussing on adding more details to the dive info page and</div><div class="">also the ability to edit and save dive details.</div><div class=""><br class=""></div><div class="">Once Tomaz approves my work, I think, what I have done so far is ready </div><div class="">for master.</div><div class=""><br class=""></div><div class="">My code is at: <a href="https://github.com/gracie89/subsurface" target="_blank" class="">https://github.com/gracie89/subsurface</a>, in the devel branch.<br class=""><div class=""><br class=""><div class=""><div dir="ltr" class="">--<div class="">Grace K</div></div></div>
</div></div></div>
</blockquote></div><br class=""></div>
_______________________________________________<br class="">subsurface mailing list<br class=""><a href="mailto:subsurface@subsurface-divelog.org" class="">subsurface@subsurface-divelog.org</a><br class="">http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface<br class=""></div></blockquote></div><br class=""></body></html>