[Kstars-devel] Proposal: Merge bleeding-edge into master

[Aleksey Khudyakov]

On 10 June 2013 05:10, Akarsh Simha <akarshsimha at gmail.com> wrote:
> Hi
>
> It looks like we have a lot of fixes that would be good to put into
> this release currently sitting in bleeding-edge.
>
> While this defeats the initial purpose of creating bleeding-edge, I
> think it might be best to merge it into master and use bleeding-edge
> for only those fixes that should not go into the current release
> (4.11)
>
> The other option is to cherry-pick all the relevant commits into
> master.
>
> What do you all think about these options? I feel that the NaN
> magnitude stuff is stable enough to check into master (that was the
> initial reason I created bleeding-edge)
>
Can't say anything about this particular situation. But shouldn't we use
per-feature/complicated bug fix branches in the future. Than we wouldn't
end in situation when we want merge some features from branch and
not others.

Simple fixes should go straight into the master I suppose.