[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Proposal: make squash-merging the default behavior for gitlab MRs
From:       Carson Black <uhhadd () gmail ! com>
Date:       2020-10-07 16:12:44
Message-ID: CADgfn_02=nocSPKoV7bmQwGj4LdkKTckV4MateJDcC6PCp1RGw () mail ! gmail ! com
[Download RAW message or body]

Am Mi., 7. Okt. 2020 um 11:27 Uhr schrieb Thomas Friedrichsmeier
<thomas.friedrichsmeier@kdemail.net>:
>
> Am Tue, 6 Oct 2020 08:26:02 -0600
> schrieb Nate Graham <nate@kde.org>:
> > GitLab already *kind of* offers this, in the form of the "Squash
> > commits" checkbox next to the merge button. Apparently it's not
> > obvious enough though, because I can think of a bunch of cases of
> > multi-commit MRs with mostly garbage commits accidentally not being
> > squashed when merging.
>
> Unfortunately the workflow is rather backwards in that the checkbox
> needs to be ticked, when creating the merge request, not after review.
> However right before merging would be the time to judge whether the
> commit history contains valuable information or useless noise.
>
> (IIRC the "squash commits" checkbox can still be changed at that
> point, but it's not obviously visible, then).

The checkbox is fairly visible for me, by the merge button like Nate
said: https://imgur.com/a/gzRDYnZ

This can be ticked immediately after review and before merging easily
like you said would be the ideal time to do so.

-- Jan
[prev in list] [next in list] [prev in thread] [next in thread]