Re: Gitlab workflow

2019-07-06 Thread Sven Panne
Am Sa., 6. Juli 2019 um 19:06 Uhr schrieb Bryan Richter : > [...] Rather than argue against GHC's current practices, however, I would > like > to understand them better. What issues led to a rebase-only workflow? > Which expert opinions were considered? What happy stories can people > relate? We

Re: Gitlab workflow

2019-07-06 Thread Brandon Allbery
For one, merge commits tend to be big, annoying, and a problem for anyone who finds themself working on something that someone else just blew away or rewrote because they weren't checking back and you can't pick only part of the merge commit unless it's itself broken into multiple commits per file

Re: Gitlab workflow

2019-07-06 Thread Bryan Richter
I can't help but notice that there are a lot of issues caused by adhering to a rebase-only workflow. I understand that lots of projects use this workflow, but I still don't understand its popularity. Git is just not designed to be used this way (although I admit that git is flexible enough to

lint-submods-marge consistently failing when attempting to update Haddock

2019-07-06 Thread Ryan Scott
I've noticed that Marge's most recent batch is consistently failing after repeated attempts. Each time, the failure is only in the lint-submods-marge job. Here is an excerpt from the most recent failure [1]: Submodule update(s) detected in 1cd22260c2467650dde8811cc58e89594a016f43: