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 (ignore the "..") I guess I'll cherry-pick again ... Hugo > On Monday 07 February 2011, Andras Mantia wrote: > > On Wednesday, February 02, 2011 18:36:28 Alexander Neundorf wrote: > > > I don't really care how it will be, but I really think we should agree > > > on one common recommended and documented workflow to use. > > > > I agree of having a recommended way of doing, but I do not agree forcing > > a predefined workflow on the contributors. As the thread cleary shows, > > some use master as base and work there (and used to do it in the past X > > years), others work on stable. Forcing a way onto the developers just > > becase the tool's result is nicer in that way will not make me happy. > > Well, I think a recommendation for those who are not git-masters is > important, so a workflow which leads to few conflicts and makes people > happy when followed (like a nice history etc.) would be a good thing to > have. > > I don't think it has to be "forced" on people who know what they are doing. > > Alex