search

Codeception / module-rest

REST module for Codeception
MIT License
54 stars 27 forks source link

Update REST.php #27

Closed ThomasLandauer closed 3 months ago

ThomasLandauer commented 4 years ago

See https://github.com/Codeception/module-rest/issues/22

TavoNiievez commented 3 months ago

@ThomasLandauer Could you please fix the conflicts in this PR? Sorry, it's a pretty old one.

ThomasLandauer commented 3 months ago

OK, done - but I don't know what this is all about ;-)

W0rma commented 3 months ago

@ThomasLandauer Your latest commits broke the CI because now the method deleteHeader() exists twice in Rest.php.

Are you familiar with git rebase? I guess that's the right tool to fix the conflicts with the master branch.

I just cherry-picked your first commit, rebased and created the PR https://github.com/Codeception/module-rest/pull/106

ThomasLandauer commented 3 months ago

Are you familiar with git rebase?

No :-( I'm using GitHub's website...

I just cherry-picked your first commit, rebased and created the PR #106

Sure! So I can close here?

W0rma commented 3 months ago

So I can close here?

Yes, I think so.