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

check for error in message.AddAttachment #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

antcs
Copy link
Contributor

@antcs antcs commented Aug 17, 2020

No description provided.

@coveralls
Copy link

coveralls commented Aug 17, 2020

Coverage Status

Coverage remained the same at 80.217% when pulling c73cf4e on antcs:check-error into 505cfd6 on gregdel:master.

@gregdel
Copy link
Owner

gregdel commented Aug 18, 2020

Hello, thanks for your contribution !

I think the commit message should updated:

  • it should start with an uppercase letter
  • it could be more clear to specify that you're updating the tests and not the library itself

@antcs
Copy link
Contributor Author

antcs commented Aug 20, 2020

@gregdel Can you have a second look?

@gregdel
Copy link
Owner

gregdel commented Aug 20, 2020

Hello, I just merged you other PR, this one is now in conflict.
Could you rebase this PR ?

@antcs
Copy link
Contributor Author

antcs commented Aug 20, 2020

@gregdel merge conflict resolved

@gregdel
Copy link
Owner

gregdel commented Aug 20, 2020

Could you rebase instead of merging, it would be better to have only one commit for this PR.
There's multiple ways to to this but a simple way would be:

  • Go to your master branch and pull the latest changed
  • Go back to the branch containing the code for this PR and remove the commit we don't need (git reset --hard for exemple)
  • Use git rebase from master

You should end up with only one commit :)

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.

3 participants