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

migrate to hardhat-chai-matchers and hardhat-toolbox #119

Closed
wants to merge 7 commits into from
Closed

migrate to hardhat-chai-matchers and hardhat-toolbox #119

wants to merge 7 commits into from

Conversation

ahmedali8
Copy link
Contributor

Resolves issue: #112

@ahmedali8 ahmedali8 changed the title migrate to hardhat chai matchers migrate to hardhat-chai-matchers and hardhat-toolbox Jul 9, 2022
@ahmedali8
Copy link
Contributor Author

Resolves issue: #120

@PaulRBerg
Copy link
Owner

Hi @ahmedali8, thanks for your PR. Happy to merge this, but it looks like there are conflicts now. Could you please take a look at resolve them?

This must have happened after I merged #116.

@ahmedali8
Copy link
Contributor Author

Hey @PaulRBerg. Conflicts resolved!

test/greeter/Greeter.ts Outdated Show resolved Hide resolved
@PaulRBerg
Copy link
Owner

PaulRBerg commented Jul 12, 2022

Hey @ahmedali8, just submitted my review. Here's a bit of additional feedback, if I may:

  1. It looks like you merged my main branch instead of rebasing - in the majority of cases like this when you submit a PR to a repo and that repo has updated its main tip, it's better to use git rebase instead. Rebasing keeps the historical commits in chronological order and it also tends to create fewer git conflicts.
  2. It looks like you didn't give me permission to contribute to your branch - this is generally useful so that I don't have to request changes from your for every minor thing that should be changed that I could change myself.
  3. It's clearer for historical purposes to create a bespoke branch name on your fork, e.g. in this case something like refactor/hardhat-toolbox would have been nice.

@ahmedali8
Copy link
Contributor Author

image

hey @PaulRBerg, thanks alot for the guidance.

  1. I'll make sure to follow this for future PRs as I didn't know this previously.
  2. given you permission already since the beginning, screenshot attached.
  3. should I close this and create a new PR or what should I do please guide?

@ahmedali8 ahmedali8 deleted the branch PaulRBerg:main July 12, 2022 11:11
@ahmedali8 ahmedali8 closed this Jul 12, 2022
@ahmedali8 ahmedali8 deleted the main branch July 12, 2022 11:11
@ahmedali8 ahmedali8 restored the main branch July 12, 2022 11:11
@ahmedali8 ahmedali8 deleted the main branch July 12, 2022 11:13
@PaulRBerg
Copy link
Owner

given you permission already since the beginning, screenshot attached.

Oh, shoot. Sorry then! My bad.

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.

2 participants