On Sunday 11 December 2011 16:50:09 Luke Kenneth Casson Leighton wrote:
> On Sun, Dec 11, 2011 at 11:38 AM, Martin Gräßlin <mgraesslin@...> wrote:
> > If Trinity needs Trinity specific patches to KWin those would have to go
> > into a branch.
> ... where it would be better than nothing but would still ultimately
> end up as bit-rot unless extreme care was taken. whether the code
> ends up as bit-rot or ends up properly incorporated into KDE very much
> depends on whether the KDE team can develop trust of the Trinity team.
KWin currently comes in master in two flavors and we are able to support that.
As well we currently have one long-living branch and due to feature freeze
several short living branches.
As long as Trinity developers follow the KWin development on the files they
change from time to time there should not be any problem. Even merging could
be done automatically.