Yes, I will do that, even though I don't want to fix everything into marble
;)
For me the most important goal is that when looking at the history of the
master branch, we see only one linear list of commits most of the time.
For example, in the last days there was a few merges of branches containing
just a few small commit. It's much better for these to appear as standard
commit on master rather than branch merge. For this, a rebase is needed
before pushing to master
Fabien
On Mon, Dec 4, 2017 at 11:44 AM, Georg Zotti <georg.zo...@univie.ac.at>
wrote:
> Dear Fabien,
>
> I have started reading the progit book, and it describes a lot of
> strategies for development. However, how they best apply to Stellarium is
> still not fully clear to me.
> It might even be good to have a "master" (from which the numbered releases
> are created) and "dev" or "next" branches (for the weekly betas?)
> The progit book has a warning section about when not to use rebase. (esp.
> after branching from public non-master branches)
>
> I usually just merged BZRs trunk to my branches before merge requests, or
> after large updates on trunk. Maybe this can be better replaced by a
> rebase with git? And of course we merged branches into trunk when they were
> ready.
>
> Maybe you can develop&clarify such "collaboration guidelines" on our
> github wiki?
>
> Kind regards,
> Georg
>
>
>
> Am 04.12.2017 11:06, schrieb Fabien Chéreau:
>
>> Hi,
>>
>> after migrating the git, I noticed that the history of stellarium is
>> full of merge commits, and this is a real mess to understand.
>>
>> We should really avoid merge commits unless they are really necessary
>> (I would say only for stable branch -> master synchronizations), and
>> try to keep the history linear. I already changed the settings on
>> github so that pull requests are only allowed when rebased.
>>
>> In general, if someone has a branch to merge in the tree, he should
>> always rebase the branch first (git rebase origin/master), and then
>> simply push the branch on master (git push origin HEAD:master). At the
>> end the commits will just add on the top of the current master's head
>> and the history will remain linear.
>>
>> Fabien
>> ------------------------------------------------------------
>> ------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> _______________________________________________
>> Stellarium-pubdevel mailing list
>> Stellarium-pubdevel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
>>
>
> ------------------------------------------------------------
> ------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Stellarium-pubdevel mailing list
> Stellarium-pubdevel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Stellarium-pubdevel mailing list
Stellarium-pubdevel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/stellarium-pubdevel
