On 23/02/2011, Hugo Pereira Da Costa <h...@oxygen-icons.org> wrote: > Hi All, > > For the record, it appears (unless I am doing something wrong), that git > merge > of KDE 4.6 into trunk (while trying to fix and forward-port a bug) for kde- > workspace is "broken" again. > > I end up with: > > # both modified: ../../khotkeys/data/kde32b1.khotkeys > # both modified: ../../kwin/effects/configs_builtins.cpp > # both modified: > ../../kwin/effects/highlightwindow/highlightwindow.cpp > # both modified: ../../kwin/tabbox/tabboxhandler.cpp > # both modified: ../../plasma/generic/applets/icon/icon.cpp
This is *mainly* because kwin reformatted the whole code in master but not in 4.6, so any attempt to merge gives conflicts in those files. I just merged 4.6 into master again. I checked the 16 commits pending merge and they were all was already backported or forward-ported manually (via cherry-pick); so I could just resolve all conflicts to the code in master. -- Nicolas
