On 9. 7. 2012 Lucas Lira Gomes wrote:
> Hi everyone,
Hi Lucas,
> My amarok repo:
> http://quickgit.kde.org/index.php?p=clones%2Famarok%2Fgomes%2Fmaskmaster-ama
> rok.git&a=summary (tomahawk
> branch)
I've checked above repo and the master branch there is polluted with many
Merge branch 'master'
G'day,
On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote:
> I've checked above repo and the master branch there is polluted with many
> Merge branch 'master' of git://anongit.kde.org/amarok commits. Shouldn't all
> these be fast-forwards?
"Merge" and "fast-forward" are not antonyms. W
On 10. 7. 2012 Edward Toroshchin wrote:
> G'day,
>
> On Tue, Jul 10, 2012 at 01:25:59PM +0200, Matěj Laitl wrote:
> > I've checked above repo and the master branch there is polluted with many
> > Merge branch 'master' of git://anongit.kde.org/amarok commits. Shouldn't
> > all these be fast-forward
On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote:
> Lucas' repo looks like it has no his own commits in master. Therefore I
> wanted
> to say: Shouldn't all his `git pull git://anongit.kde.org/amarok master`
> commands performed in his master branch have resulted in fast-forwards? (th
On 10. 7. 2012 Edward Toroshchin wrote:
> On Tue, Jul 10, 2012 at 03:01:06PM +0200, Matěj Laitl wrote:
> > E.g. `git push` without --rebase in master may still be correct if you
> > don't have own commits so that it results in fast-forward, that's what I
> > wanted to say.
>
> I see. There is actu
> Agreed. And hey, I didn't know about merge.conflictstyle, that'll make my
> life
> much easier, thanks!
Anytime! Try also kdiff3 as mergetool.
--
Edward "Hades" Toroshchin
dr_lepper on irc.freenode.org
___
Amarok-devel mailing list
Amarok-devel@kde
---
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105488/
---
(Updated July 10, 2012, 2:54 p.m.)
Review request for Amarok and Ralf Enge
Hi,
Sorry for being so late to update my project, I was stuck with the
QueryMaker stuff, but now it starts working.
Now the Spotify service plugin can be successfully loaded and enabled. When
you type query string in the collection browser, it will automatically send
the query to the Spotiy resol
