From kde-core-devel Mon Oct 19 07:07:27 2009 From: Johannes Sixt Date: Mon, 19 Oct 2009 07:07:27 +0000 To: kde-core-devel Subject: Re: Version mismatch when building trunk Message-Id: <4ADC102F.5050108 () viscovery ! net> X-MARC-Message: https://marc.info/?l=kde-core-devel&m=125593609012314 Thiago Macieira schrieb: > The branch switching is necessary in the workflow I created because I'm > treating kde-qt branches as patch queues. Each time I create a new branch, I > reapply all the previous patches from KDE, while local changes, like backports > from Qt itself, are lost. We start anew. You could create a branch latest-stable that merges 4.6-stable etc. such that the merge always takes the content of the merged-in branch. Then people need just track lastest-stable, and they will be fast-forwarded by the next git pull. -- Hannes