Am 2017-05-15 um 13:13 schrieb Oleg Kalnichevski:
On Mon, 2017-05-15 at 11:54 +0200, Julian Sedding wrote:
Force pushing is considered a bad practice in Git for good reasons,
thus rewriting history of published branches is IMHO a no-go. It
makes
everybody's life harder (and developers less experienced with Git may
not be able to integrate the rewritten history at all).
How so exactly? So, it is not OK to have a developer spend a few
minutes integrating upstream changes into the local branch but it is OK
to have the release manager waste time wading through hundreds of
unnecessary commits when preparing a release or chasing a regression?
It is absolutely not OK for you as RM spending valuable time fixing an
ugly log. Every committer is obliged to leave a clean log. If a dev does
not stick to these rules he should be taken away his commit right.
If you want to clean up because committers are too stupid to do so, we
should take the command-and-leutnant approach. Committers never push
directly to a live release branch, but request a PR for it. You as the
RM will merge it. It will give you all the freedom you need. So
5.0/master and 4.4/master should be protected branches writable by you
only. I am fine with that.
Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
