[llvm-dev] Flang landing in the monorepo
Chris Lattner via llvm-dev
llvm-dev at lists.llvm.org
Wed Dec 18 22:20:16 PST 2019
> On Dec 18, 2019, at 8:03 AM, James Y Knight via llvm-dev <llvm-dev at lists.llvm.org> wrote:
> The rule against merge commits is primarily because we want to encourage people to make reasonable separate commits to master which are sensible (reviewable, buildable, etc) in isolation. And, to make it so the history is more easily understandable to humans. It's not only that we don't want merge commits -- we actually don't really want people doing merges, in general.
> But, here we actually do have a merge, because flang was developed externally. This is an exceptional circumstance (and I'm sure we'll have a few more). Using a merge commit in this circumstance makes it easier for humans looking at history to understand what's going on here, rather than harder -- because it actually marks the merge as being a merge. That's the main reason why I think we ought to use a merge commit here.
This is a great summary of both sides of the policy, thanks James. I agree,
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the llvm-dev