Skip to content

Conversation

@ThomasLandauer
Copy link
Member

See #22

@TavoNiievez
Copy link
Member

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

@ThomasLandauer
Copy link
Member Author

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

@W0rma
Copy link
Contributor

W0rma commented Jul 11, 2024

@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 #106

@ThomasLandauer
Copy link
Member Author

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
Copy link
Contributor

W0rma commented Jul 11, 2024

So I can close here?

Yes, I think so.

@ThomasLandauer ThomasLandauer deleted the patch-1 branch July 11, 2024 13:05
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