[Patch] "No grouping" checkbox in playlist layout

[Tim Bocek]

Argh!  Just to make sure we're on the same page, is the conflict you're
getting in PlaylistGroupingAction.cpp and .h?  I removed those files because
they aren't needed anymore, and this seems to be causing conflicts.  I
thought I took care of those when I rebased before I did the merge request,
but I guess for some reason git is still mad at me for this.  A little
searching around doesn't reveal any good documentation on how to deal with
these merge conflicts with deleted files.

Also, unfortunately, something I did totally fubared my clone of amarok, and
now every time I run "git pull --rebase remote master" I get a ton of
conflicts.  So it will take some time for me to sort this stuff out, and I
might just need to do a fresh clone.

On Thu, Sep 3, 2009 at 1:53 AM, Nikolaj Hald Nielsen <
nhnfreespirit at gmail.com> wrote:

> Tim
>
> I just tried your patch (merging your repo) and it causes a few
> conflicts with current master. Could you please rebase and fix the
> conflicts? Then I will be happy to push this to master (after a bit of
> testing)
>
> - Nikolaj
>
> On Thu, Sep 3, 2009 at 12:25 AM, Ian Monroe<ian.monroe at gmail.com> wrote:
> > On Wed, Sep 2, 2009 at 4:49 PM, Tim Bocek<tim.bocek at gmail.com> wrote:
> >> I just finished a patch that implements tying grouping schemes to
> playlist
> >> layouts, and created a merge request at:
> >>
> >> http://www.gitorious.org/amarok/amarok/merge_requests/1415
> >>
> >> If this is too much given the state of the freeze (it does add some
> extra
> >> strings), I'm happy to just let this sit until 2.2.1.
> >
> > Also meant to mention: delete the commented out code. Commented code
> > is confusing and pointless.
> >
> > Ian
> > _______________________________________________
> > Amarok mailing list
> > Amarok at kde.org
> > https://mail.kde.org/mailman/listinfo/amarok
> >
> _______________________________________________
> Amarok mailing list
> Amarok at kde.org
> https://mail.kde.org/mailman/listinfo/amarok
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/amarok/attachments/20090903/0d82e33e/attachment.html>