Re: [Bioc-devel] Cherry picking error - SiPSiC package

2023-08-14 Thread Martin Grigorov
Hi, Maybe I wasn't very clear: "SHA" should be replaced with the commit hash For example: $ git log --oneline -1 f367ed608 (HEAD -> openeuler-22.03-sp2, origin/openeuler-22.03-sp2) Update all references of "22.03 LTS" to "22.03 LTS SP2" Here the SHA is f367ed608. So the command would be: git

Re: [Bioc-devel] Cherry picking error - SiPSiC package

2023-08-14 Thread Daniel Davis
Thank you Martin! I tried it. When I execute the git cherry-pick -x SHA command, I get "fatal: bad revision '' " Any idea? Virus-free.www.avast.com

Re: [Bioc-devel] Cherry picking error - SiPSiC package

2023-08-14 Thread Martin Grigorov
Hi Daniel, You could try `git cherry-pick -x SHA` instead. Where "SHA" is the commit hash in devel branch. This way you will cherry-pick only your particular commit. - git reset --hard - git switch devel - git log --oneline -1 # to get the SHA - git switch RELEASE_3_17 - git pull --rebase -

[Bioc-devel] Cherry picking error - SiPSiC package

2023-08-14 Thread Daniel Davis
Hello everyone, I would like to update the description of the released version of my package. Following the developer guide, I executed the git checkout and pull commands on the devel branch, changed the description file as necessary, then committed and pushed it - everything was fine. However,