[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:       Ömer Fadıl USTA <omerusta () gmail ! com>
Date:       2020-10-05 16:38:49
Message-ID: CAATbBR2vc4eXschPfm9-rurH6wndyg7aWkO7sjOseKFqH4KU+A () mail ! gmail ! com
[Download RAW message or body]

my suggestion is not making squash default but implement a way that  will
pops up a question if there are more then 1 commits in mr so user can
select on that time.

On Mon, Oct 5, 2020, 19:15 David Hurka <david.hurka@mailbox.org> wrote:

> > Even better might be to force an explicit decision by not having a
> default
> > for this at all, e.g. by offering "Rebase" and "Squash + Rebase" actions
> > next to each other.
>
> The squash checkbox is available directly next to the Rebase/Merge button;
> provided the "Allow Contributions" checkbox was checked when creating the
> MR.
>
>
>

[Attachment #3 (text/html)]

<div dir="auto">my suggestion is not making squash default but implement a way that   \
will pops up a question if there are more then 1 commits in mr so user can select on \
that time.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On \
Mon, Oct 5, 2020, 19:15 David Hurka &lt;<a \
href="mailto:david.hurka@mailbox.org">david.hurka@mailbox.org</a>&gt; \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">&gt; Even better might be to force \
an explicit decision by not having a default<br> &gt; for this at all, e.g. by \
offering &quot;Rebase&quot; and &quot;Squash + Rebase&quot; actions<br> &gt; next to \
each other.<br> <br>
The squash checkbox is available directly next to the Rebase/Merge button; <br>
provided the "Allow Contributions" checkbox was checked when creating the MR.<br>
<br>
<br>
</blockquote></div>



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