debian merging disabled

[Rohan Garg]

I went through a bunch of them yesterday, but didn't get time to finish
them off.

I'm on vacation till Tuesday and will fix them once I'm back unless someone
gets to them first.

Cheers
Rohan
On 2 Jul 2015 06:28, "Harald Sitter" <sitter at kde.org> wrote:

> as apparently people don't give a flip about resolving merge conflicts
> with debian, I am disabling automatic merging of debian's master
> branch again. i.e. if you want to merge with debian you can do it by
> hand moving forward.
> http://i.imgur.com/JQ5G11i.jpg
>
> when I enabled this feature I was very clear about me not wanting to
> be the person to keep this crap going single handedly. lo and behold I
> ended up doing it anyway because the broken merges are interfering
> with my work...
>
> #pissedoff
>
> --
> kubuntu-devel mailing list
> kubuntu-devel at lists.ubuntu.com
> Modify settings or unsubscribe at:
> https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20150702/83f254ea/attachment.html>