steven at steshaw.org
Wed Jan 9 01:49:18 UTC 2019
On Wed, 9 Jan 2019 at 05:07, Iavor Diatchki <iavor.diatchki at gmail.com>
> One other thing:
> At least on Github, using the button on the site to merge a request
> always creates a proper merge (not a rebase), so the history won't be
> straight if we do things that way. I believe the reasoning is that in this
> way, you have record of who did the merging.
> I am not sure if this holds for Gitlab, but we should look into it, if
> we want to keep the straight history.
For GitLab, you can configure 'Fast Forward Merges'. This will then only
allow fast forward merges from the UI.
I'm not sure if that's been configured for
https://gitlab.haskell.org/ghc/ghc/ as I don't have permission to look at
GitHub also has various options for merging PRs. You might have worked on a
project that only allowed merge commits but you can enable/disable
merge-commit, squash-commits and rebase-commits on GitHub.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the ghc-devs