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
