Skip to content

API admin/users, bugfix page/total pages#1001

Open
SomeMichael wants to merge 52 commits intofoodcoops:masterfrom
SomeMichael:1_API_extension_based_on_y28
Open

API admin/users, bugfix page/total pages#1001
SomeMichael wants to merge 52 commits intofoodcoops:masterfrom
SomeMichael:1_API_extension_based_on_y28

Conversation

@SomeMichael
Copy link
Copy Markdown

As suggested by @yksflip in #1000, I created a PR.

But there doesn't seam to be a way to only include specific commits into the PR. Just let me know if I should put the commits to different branches (E.g. to separate the proposed bugfix)

@yksflip yksflip added this to the 4.8 milestone Jun 10, 2023
@yksflip yksflip removed this from the 4.8 milestone Jul 11, 2023
@wvengen
Copy link
Copy Markdown
Member

wvengen commented Jul 14, 2023

Hi @SomeMichael thank you for your PR.
To include only specific commits in the PR, you can rebase it on master. If there are still a lot of commits, you may have diverged branches, and need to checkout a clean master branch from this repo, and e.g. cherry-pick the commits you want to include.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch
https://docs.github.com/en/get-started/using-git/about-git-rebase

Also, are you sure pages start at 1 and not at 0 (just to be sure)?

@RayOei
Copy link
Copy Markdown
Member

RayOei commented Mar 9, 2025

There hasn't been any follow-up so therefore I added won't fix.
The actual issue seems more or less trivial? Not checked though if it still exists and #1000 is still open.

@RayOei RayOei added the discuss Issue to discuss label Mar 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

discuss Issue to discuss won't fix

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

5 participants