shimpsblog [en]

Blog Actions

Situation

Last time I presented a first result, i.e. compiling the software and creating a Debian style package. Later in the evening a pull request came to my attention. How to deal with it? Different platforms (Codeberg, Github, Gitlab) seem to have different workflows, all integrated into the web user interface, and maybe command line support. I used Stackoverflow to figure out what to do - even if that post refers to creating rather than applying the pull request.

Solution

First I created a branch to test the method there, with several checks:

git branch -l
git log -1
git remote add ka7 https://codeberg.org/ka7/diy-gnupg.git
git fetch --all 
git checkout -b mergepullrequest 
git branch -l
git log -1
git cherry-pick 240ed7ed6fc0684fefe661399b5dd6f070dbeb6a
git show b70ca327434814a7b2bf76acade3670cdd73f748
git push -u origin mergepullrequest
git log -1
git switch main
git branch -l
git log -1

This worked the way I hoped, thus I could do it similarly by merging into the main branch.

git cherry-pick 240ed7ed6fc0684fefe661399b5dd6f070dbeb6a
git push

The commit is visible in the git log with timestamp Wed Mar 12 20:19:14 2025 +0100.

Thanks

Many thanks to the contributor ka7 for the pull request, Alex from C3S for explaining the problems with specific and generic workflow and Martin from LUGA for pointing me into the direction of a generic command line solution.

To be continued...