Skip to content

Update maintainers, manpage and completions.#10854

Merged
nandahkrishna merged 1 commit intomasterfrom
update-manpage
Mar 17, 2021
Merged

Update maintainers, manpage and completions.#10854
nandahkrishna merged 1 commit intomasterfrom
update-manpage

Conversation

@BrewTestBot
Copy link
Copy Markdown
Contributor

Autogenerated by the update-manpage workflow.

nandahkrishna
nandahkrishna previously approved these changes Mar 15, 2021
@nandahkrishna nandahkrishna enabled auto-merge March 15, 2021 11:47
@nandahkrishna nandahkrishna disabled auto-merge March 15, 2021 11:53
@nandahkrishna nandahkrishna dismissed their stale review March 15, 2021 11:59

There seems to be some issue with the workflow.

@Bo98
Copy link
Copy Markdown
Member

Bo98 commented Mar 15, 2021

Two reasons combined:

  • We should probably hard reset here to not revert other changes to the README like in
    ae82666:
    git reset origin/master
  • git-try-push does not do a git push --force-with-lease on the first attempt. So it actually does a git pull --rebase before force pushing and thus pulls back in the old commits.

@nandahkrishna
Copy link
Copy Markdown
Member

I just opened a PR to change it to git reset --hard. Didn't know about the second issue, so I'll fix that as well in #10856.

@Rylan12
Copy link
Copy Markdown
Member

Rylan12 commented Mar 15, 2021

Can this still be merged so manpages and completions are updated or does it need to wait for the workflow to be fixed?

Edit: nevermind...

@nandahkrishna nandahkrishna merged commit 1f14159 into master Mar 17, 2021
@nandahkrishna nandahkrishna deleted the update-manpage branch March 17, 2021 11:14
@github-actions github-actions bot added the outdated PR was locked due to age label Apr 17, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

outdated PR was locked due to age

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants