You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by "Matthias Bläsing (JIRA)" <ji...@apache.org> on 2018/03/03 21:14:00 UTC
[jira] [Commented] (NETBEANS-433) Improve merge discipline
[ https://issues.apache.org/jira/browse/NETBEANS-433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16384861#comment-16384861 ]
Matthias Bläsing commented on NETBEANS-433:
-------------------------------------------
Please close this here - it is a discussion topic and so should be on the mailing list. I just stumbled over this by chance.
> Improve merge discipline
> ------------------------
>
> Key: NETBEANS-433
> URL: https://issues.apache.org/jira/browse/NETBEANS-433
> Project: NetBeans
> Issue Type: Task
> Reporter: Karl Richter
> Priority: Major
>
> The git repository https://github.com/apache/incubator-netbeans.git contains a lot of duplicate commits (e.g.
> {noformat}
> commit 90366d092beb49d563922c8023093d91d6b59db1 (HEAD -> master, origin/master, origin/HEAD)
> Merge: ccc9b5f92 4c4bdd60a
> Author: Jaroslav Tulach <ja...@oracle.com>
> Date: Mon Feb 26 07:59:53 2018 +0100
> Merge pull request #434 from blackleg/ci_badges
>
> Add build badges to README.md
> commit 4c4bdd60adc2a26800621a76220dab7b146d80f4
> Author: Hector Espert <he...@gmail.com>
> Date: Sun Jan 21 12:47:26 2018 +0100
> Added build badges to README.md
> {noformat}
> as well as merge commits (the duplicate example even introduces an empty separate merge commit for a fast-forward merge).
> The duplicate commits should simply be avoided since they increase the number commits which have to be investigated in bisection search of regressions. Furthermore they make it harder to go through git log and make the code base appear in bad shape.
> The merge commits should be avoided because they disturb the history log and hide information what really happened on the merge branch. It's fine to force all contributors to rebase their pull request branches on `master`. In this way all merges are fast-forward merges and all commit messages contain exclusively useful information. You can take https://github.com/zfsonlinux/zfs as an example for an excellent code base.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists