Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Docs for some of DocH's less intuitive constructors #814

Merged
merged 1 commit into from
May 8, 2018

Conversation

sjakobi
Copy link
Member

@sjakobi sjakobi commented May 7, 2018

No description provided.

@alexbiehl alexbiehl merged commit 2dd12f5 into haskell:ghc-8.4 May 8, 2018
@alexbiehl
Copy link
Member

Thanks Simon! I don't mind if you push directly to master for small changes like these.

@sjakobi sjakobi deleted the doch-docs branch May 8, 2018 09:44
@sjakobi
Copy link
Member Author

sjakobi commented May 8, 2018

Thanks Simon! I don't mind if you push directly to master for small changes like these.

Will do. To master or to ghc-8.4 though?

(If master currently has no use, I'd propose deleting it to reduce confusion.)

@alexbiehl
Copy link
Member

Ah right. Let's delete master.

@sjakobi
Copy link
Member Author

sjakobi commented May 9, 2018

Can you remove the branch protection on master?

@sjakobi
Copy link
Member Author

sjakobi commented May 9, 2018

Gosh, sorry for the mess with the pull requests. I can clean this up by retargeting to the ghc-8.4 branch.

@sjakobi
Copy link
Member Author

sjakobi commented May 9, 2018

The affected PRs are #670, #729, #721, #728, #708, #562, #700 and #692 (replaced by #822).

@ntc2
Copy link
Contributor

ntc2 commented May 9, 2018

@sjakobi , @alexbiehl : looks like all of the PRs mentioned in @sjakobi 's last comment just got closed, but it's unclear why. Could someone explain what's going on?

@sjakobi
Copy link
Member Author

sjakobi commented May 9, 2018

@ntc2: The master branch was deleted as it didn't have a clear function in this repo. What @alexbiehl and I hadn't considered, was that GitHub would automatically close all PRs targeting the master branch.

To reopen an affected PR, you can try changing the merge target to the ghc-8.4 branch by clicking the Edit button to the right of the PR's title. Some PRs may have to be rebased.

@ntc2
Copy link
Contributor

ntc2 commented May 9, 2018

@sjakobi Ah! I just commented on all of those issues pointing back to your explanation, in case others are confused.

@sjakobi
Copy link
Member Author

sjakobi commented May 9, 2018

Thanks for helping out with this mishap, @ntc2! As #700 seems to show, simply retargeting the PR doesn't appear to work. :/

Hopefully rebasing will work for the affected PRs. As a last resort, submitters can open a new one. :/

sjakobi added a commit to sjakobi/haddock that referenced this pull request Jun 10, 2018
sjakobi added a commit to sjakobi/haddock that referenced this pull request Jun 13, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants