[llvm-dev] [cfe-dev] Phabricator -> GitHub PRs?
Renato Golin via llvm-dev
llvm-dev at lists.llvm.org
Fri Sep 11 17:15:27 PDT 2020
On Fri, 11 Sep 2020 at 23:56, Hubert Tong via llvm-dev <
llvm-dev at lists.llvm.org> wrote:
> On Fri, Sep 11, 2020 at 3:45 PM Stephen Neuendorffer via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>>> Just to clarify: All the LLVM incubator repositories have "enforce
>>> linear history" enabled. Neither "Squash and Merge" or "Rebase and Merge"
>>> results in a Merge commit in the git history.
>>>
>> I am not aware of/still have not experienced a case where "Rebase and
> Merge" retains merge commits.
>
It does not. We can disable the merge commit on Github settings. Plus, the
master branch history protection will stop people from merge-commit or
force-push by hand anyway.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20200912/16f73b3e/attachment.html>
More information about the llvm-dev
mailing list