php-the-right-way icon indicating copy to clipboard operation
php-the-right-way copied to clipboard

Published 20 hours ago • verified publisher icon codeguy

Update links to redirected GH repos

Open Xymph opened this issue 1 year ago • 3 comments

The owners of several GitHub repositories have been renamed, this PR updates their links (and in one case, also the link key).

Xymph avatar Aug 26 '22 21:08 Xymph

@Xymph Merged everything that did not have a conflict. Also added you as a collaborator. You seem trustworthy and have more time than I do currently. Thank you so much for your time and contributions!

codeguy avatar Oct 30 '22 14:10 codeguy

Thanks for the confidence. I wasn't actually planning to stick around much after my batch of corrections, because my time is spread thin enough as it is, too. But this seems a low traffic repo most of the time, about a worthy document, so I'll contribute what and when I can. Cheers!

Xymph avatar Oct 30 '22 16:10 Xymph

In spite of the promotion :) I am not that well versed in branches and merge conflicts. I was able to resolve #933 by copying the adjacent, conflicting change into the branch, which could then be merged into gh-pages. But the same approach here with d6b8776 doesn't help, now there is a conflict in two of the changes that 6e988d6 intentionally wants to make, and I don't understand why. @codeguy, would you be able to advice how to fix this?

Xymph avatar Nov 05 '22 11:11 Xymph

@codeguy Would you be able to resolve this situation? Thanks.

Xymph avatar Dec 27 '22 15:12 Xymph

Conflicts resolved by @waldyrious - much obliged for your assistance! :+1:

Xymph avatar Jan 06 '23 18:01 Xymph