Karl Richter created NETBEANS-433:
-------------------------------------
Summary: Improve merge discipline
Key: NETBEANS-433
URL: https://issues.apache.org/jira/browse/NETBEANS-433
Project: NetBeans
Issue Type: Task
Reporter: Karl Richter
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 <[email protected]>
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 <[email protected]>
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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
