[GNC-dev] gnucash git: please as little merge commit as possible
ddittmann at gmx.net
Mon Jan 6 08:33:44 EST 2020
it was my first commit to the project. I'am sorry about my rare git and
It was an (unwanted) interim stage during updateing my branch and will
never happen again.
On 05.01.20 21:44, Christian Stimming wrote:
> Dear Daniel,
> thanks a lot for your contributions to gnucash.
> Concerning the git commits I have a small wish: Could you try to send as
> little merge commits as possible in your pull requests? In particular, your
> recent test_gnc_setlocale patch branch contains a merge commit merging
> upstream/maint. This shouldn't go into the gnucash git. Instead, please rebase
> your contribution branch on top of most recent master, so that your change is
> only exactly one commit (or multiple linear commits for complex contributions)
> but does not contain extra merges. The extra merges are IMHO super confusing
> in the git history but bring completely zero knowledge gain.
> Contributions which consist of exactly one commit IMHO should always be merged
> as fast-forward (or rebase) and not as merge commits, but that's the
> responsibility of the gnucash maintainers. Your responsibility would be to
> send in pull requests which don't contain unneeded merge commits. Thanks a
> And thanks again for your contribution.
> Best Regards,
More information about the gnucash-devel