-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
no-squash: true cherry-picks commits in the wrong order #114
Labels
bug
Something isn't working
Comments
I'll work on a fix now. |
earl-warren
added a commit
to earl-warren/git-backporting
that referenced
this issue
Apr 1, 2024
earl-warren
added a commit
to earl-warren/git-backporting
that referenced
this issue
Apr 1, 2024
earl-warren
added a commit
to earl-warren/git-backporting
that referenced
this issue
Apr 1, 2024
earl-warren
added a commit
to earl-warren/git-backporting
that referenced
this issue
Apr 1, 2024
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this issue
Apr 1, 2024
Good catch, I can confirm that commits are applied in the wrong order (LIFO workflow) whereas the correct order should follow FIFO mechanism. |
earl-warren
added a commit
to earl-warren/git-backporting
that referenced
this issue
Apr 2, 2024
lampajr
pushed a commit
that referenced
this issue
Apr 2, 2024
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
It applies the latest commit first intead of the last, which can lead to conflicts when two commits modify the same file.
To Reproduce
Steps to reproduce the behavior:
Expected behavior
It applies the commits in the right order instead and does not confict
Additional context
https://codeberg.org/forgejo/forgejo/actions/runs/10410#jobstep-5-31 is an example where that happened. Manually applying the same commits in the right order do not lead to conflicts.
The text was updated successfully, but these errors were encountered: