develooper Front page | perl.perl5.porters | Postings from July 2019

Re: Transition from RT to GitHub [FAQ]

Thread Previous | Thread Next
July 29, 2019 09:35
Re: Transition from RT to GitHub [FAQ]
Message ID:
On Sun, Jul 28, 2019 at 03:35:41PM +0300, Sawyer X wrote:
> I think we should make "rebasing" a requirement for merging. That isn't
> always the case at the moment anyway, but with Github we have more tools
> to make it happen.

As someone who does releases every now and then, I'm very much in favour
of keeping the merge commits. The most time consuming part of making a
release is creating the perldelta. And one of the more time consuming
parts of that is to determine which commits belong together so they
can get a single entry in perldelta. If commits have been rebased,
and the merge commit disappears it becomes harder to determine this;
with the merge commit, it's easier.

At $WORK, I use

        rebase = merges
        edit = false
        ff = false

which creates a linear history (to aid bisecting), but keeps the branches
and merges visible.


Thread Previous | Thread Next Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at | Group listing | About