On Tue, Nov 6, 2012 at 12:40 PM, Reza Shah <rshah0...@kireihana.com> wrote: > Hi,
Hi Reza, > > I have created my own branch for porting c++ plasmoid to qml one. > > I created diff for review board manually, just doing git diff > master..rshah/comicqml, > then remove unnecessary diff from other application using kwrite. > > I believe this is not the proper way. > > Seems, i have to sync my branch with master. > I have read some method like rebase, merge but not clear how it would work. > What is the best way to have minimal diff (only my changes)? You will want to merge master into your branch, which should then allow you to generate a diff of only the changes in your branch. > > Please share your best workflow :) > > > Regards, > Reza Regards, Ben > >>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe << >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
