Strongly in favor of #1.
If we decide to move away from #1, I strongly believe it should be done
well after the github migration. (i.e. lets not change everything at once!)
Philip
On 1/29/19 2:33 PM, Tom Stellard via cfe-dev wrote:
Hi,
As part of the migration of LLVM's source code to github, we need to update
our developer policy with instructions about how to interact with the new git
repository. There are a lot of different topics we will need to discuss, but
I would like to start by initiating a discussion about our merge commit
policy. Should we:
1. Disallow merge commits and enforce a linear history by requiring a
rebase before push.
2. Allow merge commits.
3. Require merge commits and disallow rebase before push.
I'm going to propose that if we cannot reach a consensus that we
adopt policy #1, because this is essentially what we have now
with SVN.
What does everyone think?
Thanks,
Tom
_______________________________________________
cfe-dev mailing list
cfe-...@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
_______________________________________________
lldb-dev mailing list
lldb-dev@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-dev
