Commits are cherry-picked in the wrong order on github

kiegroup / git-backporting

Git backporting is a CLI tool to execute pull request backporting.

MIT License

15 stars 8 forks source link

Commits are cherry-picked in the wrong order on github #130

Closed mandre closed 2 months ago

mandre commented 2 months ago

Presumably since https://github.com/kiegroup/git-backporting/pull/115, the commits are cherry-picked in the wrong order when running from github, which may cause merge conflicts. This might be a difference between github and codeberg.

See https://github.com/gophercloud/gophercloud/actions/runs/9956839768/job/27507596364 for an example of merge conflict.

lampajr commented 2 months ago

Thanks @mandre !

You're right, it looks like that Codeberg and Github (even if api-compatible) are returning the commits list in different order:

Github: top to bottom === first to last
Codeberg: top to bottom === last to first

I will try to change this under the hood such that it will be transaparent to the user (hoping that the order won't change in the future)