Re: Another proposal for modernization of our infrastructure

2015-01-29 Thread Felix Rohrbach
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, On 29.01.2015 12:25, Jan Kundrát wrote: > Git has a config diff.orderfile option which might solve this > reasonably well. Do you think that the following sorting order is > reasonable for a KDE's default? > > CMake* cmake* src/*.h src/*.cpp *t

Re: Adopting AppData in KDE?

2013-11-03 Thread Felix Rohrbach
Richard, do you realize how you sound like? "Nice application you have there, would be a shame if something would... happen to it." Imho it's a matter of respect to discuss a standard beforehand with a community. And this threat to exclude apps, well... Also, using this as a sign of quality is n

Re: Merge or Cherry-Pick?

2011-02-02 Thread Felix Rohrbach
ks until > backporting fixes. You could try using a new local branch for every new feature or bug fix that you only merge into master if you want to push it to origin (so master is nearly always the same as origin/master). If you work like this, you can: 1. Create your fix in 2. merge into master 3. rebase on 4.6 branch 4. merge into 4.6 5. push :-) Regards, Felix Rohrbach