Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINTAINERS: add @Waples to collaborators #5775

Merged
merged 1 commit into from
Apr 16, 2021

Conversation

Waples
Copy link
Member

@Waples Waples commented Apr 16, 2021

Closes #5774

@@ -60,6 +62,7 @@ If you are an owner of the organization, you should be able to see an automated
- Matthew Peveler ([@MasterOdin](https://github.com/MasterOdin)):
[09 January 2021](https://github.com/tldr-pages/tldr/issues/5122) — [01 April 2021](https://github.com/tldr-pages/tldr/issues/5473)


Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the double enter?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let's clear that out @Waples:

Suggested change

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everywhere else in the markdown document has double breaks between , why not here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Owh nevermind, I had a diff left over where I fixed all those double breaks. Want me to fix that or remove this ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, send the fix in another PR 🤷‍♂️

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would've preferred that we fixed this here, because I see no reason for a newline being added where it was 🤔

@Waples will you please open a PR to fix this?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trusted too much in this comment #5775 (comment) my fault.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't worry, it's no problem. I think @Waples made a mistake because there were actually no double line-breaks in the file before this PR.

@navarroaxel navarroaxel changed the title MAINTAINERS: add Waples MAINTAINERS: add @Waples to collaborators Apr 16, 2021
@navarroaxel navarroaxel added the community Issues/PRs dealing with role changes and community organization. label Apr 16, 2021
@navarroaxel
Copy link
Collaborator

Oh, you should rebase with the tldr-pages/master, do you need help to do that?

@bl-ue bl-ue force-pushed the update-MAINTAINERS.md branch from 7b59ffc to 2825686 Compare April 16, 2021 17:12
@bl-ue
Copy link
Contributor

bl-ue commented Apr 16, 2021

I rebased and fixed it. @Waples the problem was that you forgot to update your fork's master branch with the latest commits from upstream's master — that's not always a problem, but this file is edited somewhat frequently 😄 so some conflicts were created. I resolved them all, though, so there's no problem. 👍🏻 Happens to all of us often 🤣

Copy link
Contributor

@bl-ue bl-ue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides https://github.com/tldr-pages/tldr/pull/5775/files#r615005556, LGTM!

Welcome aboard, @Waples!! 🎆

Also, I noticed that your commit was made at exactly 16:00:00 UTC (6 PM your time) — is that intentional? 😄

@marchersimon marchersimon linked an issue Apr 16, 2021 that may be closed by this pull request
@Waples Waples requested a review from navarroaxel April 16, 2021 18:48
@navarroaxel navarroaxel merged commit ee0f578 into tldr-pages:master Apr 16, 2021
@Waples Waples deleted the update-MAINTAINERS.md branch April 16, 2021 18:51
@Waples
Copy link
Member Author

Waples commented Apr 16, 2021

@bl-ue not intentional, but good for stats I suppose

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community Issues/PRs dealing with role changes and community organization.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add collaborator: @Waples
3 participants