Rebase code for failing PRs

[RichardWallis]

Following the fix of #2946, caused by the upgrading of some dependant python libraries such as rdflib, PRs that were failing (such as #2958) now pass CI tests.

For the failing PRs to pass the CI tests the code behind the PR had to be rebased against the current state of the main branch. This was simple for PRs based on branches in this repository.

However several PRs (#2941, #2953, #2965, #2985 and possibly #2738) are hosted in branches in other forked repositories. In these cases the code in those repositories, should be rebased against the main branch in this repository.

This issue is to capture to actions to achieve that

[gmackenz]

How do I do a Rebase, I am very unfamiliar with github.

[RichardWallis]

@gmackenz Let's see how others get on with this question over the next few days. Then we may come up with an easy shared way to do it.

Git always has several ways to do anything!

[danbri]

I hate to make work for contributors, but my go-to git documentation is https://xkcd.com/1597/

[dr-shorthair]

I've definitely done that.

[dr-shorthair]

(saved my work elsewhere, and made a fresh clone)

[mattgarrish]

If you want to do it straight from github, I just realized they have a "Fetch upstream" button in your fork. If there are no merge conflicts, it should update everything for you. If not, it'll open a pull request so you can resolve the conflicts.

The old fashioned way I followed is to open a pull request yourself to merge main from here into your fork.

[RichardWallis]

@mattgarrish great suggestion, but where is this wonderful button. I don't see it on the Github site.

Also. Github documentation on how to merge from upstream into a fork:
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/merging-an-upstream-repository-into-your-fork

[mattgarrish]

If you go to a fork, it should appear in the Code tab just below the various buttons at the top (at the right edge):

It's also documented here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

[RichardWallis]

Ah that is not visible to me when I view someone else's fork repo. Presumably you need to be the owner.

[philbarker]

I can confirm that it works for me on forks that I own. Thank you @mattgarrish !

[mattgarrish]

Presumably you need to be the owner.

Yes. If you don't have write access, you could only request the owner sync their repository by going into the pull request tab and open a pull request that pulls the latest changes in this repository across to theirs.

If you want to prompt fixes for the broken PRs, you'd need to open a PR for each one. For example, you could update 2965 here: acka47/schemaorg@main...schemaorg:main

[github-actions]

This issue is being nudged due to inactivity.