debian merging disabled

[Rick Timmis]

On Thursday, 2 July 2015 06:27:49 BST, Harald Sitter 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
> 
Hi Harald

Your doing a great job, and I would like to help you.
We use Jenkins at work, although I consider myself a novice.
You have my willingness to assist but I need hand holding and directing to 
get me started.
How can I help you ?

Rick 

-- 
Sent using Dekko from my Ubuntu device