Recommended way for bigger changes in git ?
neundorf at kde.org
Fri Apr 20 17:08:29 UTC 2012
On Friday 20 April 2012, Stephen Kelly wrote:
> Alexander Neundorf wrote:
> > On Thursday 19 April 2012, Alexander Neundorf wrote:
> >> Hi,
> >> in the next time I'll have to update extra-cmake-modules and
> >> kdelisbs/frameworks dependent on it.
> >> How should I do this ?
> >> Simply push to both repositories more or less at the same time ?
> >> AFAIK you don't want me to increase the version number of e-c-m, which
> >> would handle this issue ?
> >> Send notification emails somewhere ?
> >> When updating kdelibs and pushing, what is the correct way to do it ?
> >> There were long discussions e.g. on k-c-d about the proper way to merge,
> >> commit and push, and I couldn't really follow.
> >> So, what is the recommended way to use git in the frameworks branch ?
> > So I will just pull and push from the frameworks branch and it will be
> > fine ?
> Please do this first:
> git config --global branch.autosetuprebase always
This will be a global git setting, right ?
Will this also be ok for the cmake git workflow or do I mess something up with
that then ?
More information about the Kde-frameworks-devel