[GHC DevOps Group] CircleCI job accounting question

[Simon Marlow]

On 14 December 2017 at 17:30, Ben Gamari <ben at well-typed.com> wrote:

> Historically GHC avoided this since GHC avoided merge commits as they
> complicate bisection. However, now since GitHub supports rebase-merging
> this is certainly a compelling option. It's certainly much simpler than
> the approach I outlined above yet provides the same benefits.
>
> If no one objects I think this sounds like a great path forward.
>

We'll have to be careful to tell people that PRs will be squashed when
merging, since the current workflow is to push multiple patches at once to
master.

How does merging PRs work when our source of truth is not on github?

Cheers
Simon




> Cheers,
>
> - Ben
>
>
> _______________________________________________
> Ghc-devops-group mailing list
> Ghc-devops-group at haskell.org
> https://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devops-group
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devops-group/attachments/20171215/40320b87/attachment.html>