Re: 4.8 branch
Am 21.12.2011 12:12, schrieb Aaron J. Seigo: On Wednesday, December 21, 2011 11:45:16 Martin =?ISO-8859-1?Q?Gr=E4=DFlin?= wrote: Am 21.12.2011 11:20, schrieb Aaron J. Seigo: > hi :) > > some of you will have noticed that there is now a KDE/4.8 branch in > the > modules. i would like to request that all fixes happen in the KDE/4.8 > branch > and then: > > * if kde-workspace, cherry-pick into master > * otherwise, merge origin/KDE/4.8 into master > > if the merge fails, then you can resort to cherry-picking ... as long as scripty is not active for master, I would suggest that we go for merging from origin/KDE/4.8 to master as well. for kde-workspace? yes. I did that with 4.7 till scripty started to process in master again. Then it just became an unmergeable mess. So at least for the next few weeks it should work if everyone sticks to it. Cheers Martin ___ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
Re: 4.8 branch
On Wednesday, December 21, 2011 11:45:16 Martin =?ISO-8859-1?Q?Gr=E4=DFlin?= wrote: > Am 21.12.2011 11:20, schrieb Aaron J. Seigo: > > hi :) > > > > some of you will have noticed that there is now a KDE/4.8 branch in > > the > > modules. i would like to request that all fixes happen in the KDE/4.8 > > branch > > and then: > > > > * if kde-workspace, cherry-pick into master > > * otherwise, merge origin/KDE/4.8 into master > > > > if the merge fails, then you can resort to cherry-picking ... > > as long as scripty is not active for master, I would suggest that we go > for merging from origin/KDE/4.8 to master as well. for kde-workspace? > Also I would suggest to never cherry-pick. If a merge fails it might be > better to ping someone with more git experience to resolve it. ah, well, yes. for situations where it is a simple conflict. however, in some modules (kde-workspace, unless someone cleaned that up?) it is/was a mess and not mergeable. -- Aaron J. Seigo humru othro a kohnu se GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA EE75 D6B7 2EB1 A7F1 DB43 KDE core developer sponsored by Qt Development Frameworks signature.asc Description: This is a digitally signed message part. ___ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
Re: 4.8 branch
Am 21.12.2011 11:20, schrieb Aaron J. Seigo: hi :) some of you will have noticed that there is now a KDE/4.8 branch in the modules. i would like to request that all fixes happen in the KDE/4.8 branch and then: * if kde-workspace, cherry-pick into master * otherwise, merge origin/KDE/4.8 into master if the merge fails, then you can resort to cherry-picking ... as long as scripty is not active for master, I would suggest that we go for merging from origin/KDE/4.8 to master as well. Also I would suggest to never cherry-pick. If a merge fails it might be better to ping someone with more git experience to resolve it. Cherry-picking will just make it more difficult to merge in future. Cheers Martin ___ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
4.8 branch
hi :) some of you will have noticed that there is now a KDE/4.8 branch in the modules. i would like to request that all fixes happen in the KDE/4.8 branch and then: * if kde-workspace, cherry-pick into master * otherwise, merge origin/KDE/4.8 into master if the merge fails, then you can resort to cherry-picking ... cheers :) -- Aaron J. Seigo humru othro a kohnu se GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA EE75 D6B7 2EB1 A7F1 DB43 KDE core developer sponsored by Qt Development Frameworks signature.asc Description: This is a digitally signed message part. ___ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
