> On May 25, 2011, 7:47 p.m., George Goldberg wrote: > > If you merge this, please do it without making a mess of the history. You > > should create a clone of the existing telepathy-presence-applet repository, > > make a new branch, cherry pick your commits onto that branch, and then > > merge this to the master branch of the telepathy-presence-applet > > repository. Otherwise you'll make a mess of the history. > > > > For future reference, when modifying existing code, please do it by > > branching from the original code instead of starting a new history from > > scratch (even if you are basically starting again if you intend to merge it > > ontop of the old code eventually). That way, reviewboard will also work.
Could you please do this? I don't want to mess things up - Francesco ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/101438/#review3525 ----------------------------------------------------------- On May 25, 2011, 4:19 p.m., Francesco Nwokeka wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/101438/ > ----------------------------------------------------------- > > (Updated May 25, 2011, 4:19 p.m.) > > > Review request for Telepathy. > > > Summary > ------- > > I would like to merge on top of the current master, my scratch project. This > way people can test the new plasmoid applet and report bugs on it. > The repo is located @ > http://quickgit.kde.org/?p=scratch%2Fnwokeka%2FKDE-Telepathy-presence-plasmoid.git&a=summary > > clone : > git://anongit.kde.org/scratch/nwokeka/KDE-Telepathy-presence-plasmoid.git > > > Diffs > ----- > > > Diff: http://git.reviewboard.kde.org/r/101438/diff > > > Testing > ------- > > > Thanks, > > Francesco > >
_______________________________________________ KDE-Telepathy mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-telepathy
