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

Add my GSoD proposal #219

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Add my GSoD proposal #219

merged 2 commits into from
Jul 10, 2020

Conversation

xiaoya-yaya
Copy link
Member

Signed-off-by: Xiaoya Xia xiaoyaxiaesther@gmail.com

Copy link
Member

@GeorgLink GeorgLink left a comment

Choose a reason for hiding this comment

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

Thanks @xiaoya-Esther

Can you please fix the DCO sign-off.

Copy link
Member

@GeorgLink GeorgLink left a comment

Choose a reason for hiding this comment

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

Please fix the DCO sign-off

@vchrombie
Copy link
Member

Hi @xiaoya-Esther
It is easy to fix this using the command line. This following commands should work.

This will fix the sign-off on the last commit.

$ git commit --amend --signoff

This will push the changes (here, it is only the sign-off).

$ git push --force-with-lease origin patch-2

Let us know if you need any help. 😄

@xiaoya-yaya
Copy link
Member Author

Hi @vchrombie thanks for your guide, I created this PR on Github, and signed the DCO using the extension scottrigby/dco-gh-ui, the check looks like this:

Commit sha: 44d962b, Author: Esther, Committer: GitHub; Expected "Esther 56542972+xiaoya-Esther@users.noreply.github.com", but got "Xiaoya Xia xiaoyaxiaesther@gmail.com".

Should I change the name "Xiaoya Xia" into "Esther"?

And since this was first initiated on GitHub, I should clone the branch patch-2 locally first, then amend the sign-off, right?

Signed-off-by: Xiaoya Xia <xiaoyaxiaesther@gmail.com>
Signed-off-by: xiaoya <2031361857@qq.com>
@xiaoya-yaya
Copy link
Member Author

I think I get the workflow now:) Thanks!

@vchrombie
Copy link
Member

And since this was first initiated on GitHub, I should clone the branch patch-2 locally first, then amend the sign-off, right?

yes, exactly. 🙂

I think I get the workflow now:) Thanks!

It looks perfect. Good work on the sign-off @xiaoya-Esther. 👍

@vchrombie
Copy link
Member

Hi @xiaoya-Esther
Can you please resolve the merge conflicts if possible?

Let me know if you need any help. 🙂

@GeorgLink
Copy link
Member

Thanks @xiaoya-Esther

@GeorgLink GeorgLink merged commit e083022 into chaoss:master Jul 10, 2020
@xiaoya-yaya
Copy link
Member Author

Hi @xiaoya-Esther
Can you please resolve the merge conflicts if possible?

Let me know if you need any help. 🙂

Sorry, @vchrombie I just saw this message, thanks for the merge!

@xiaoya-yaya xiaoya-yaya deleted the patch-2 branch July 12, 2020 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants