No sé de que va este tema.
Pueden ser más claros o bien dejar de tocarme las narices con tanto correo.
Gracias
2017-12-04 11:06 GMT+01:00 Fabien Chéreau <fabien.cher...@gmail.com>:
> 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
