[Bioc-devel] Cherry picking error - SiPSiC package

[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
- git cherry-pick -x $SHA
- git push

Regards,
Martin


On Mon, Aug 14, 2023 at 3:56 PM Daniel Davis <danieldavis000 using gmail.com>
wrote:

> 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, when I try to checkout RELEASE_3_17 then execute git cherry-pick
> devel, a conflict error is thrown on the description file. Now that makes
> sense, but I'm not familiar enough with git to try and handle the situation
> myself.. So - what is the right thing to do if I would like to apply the
> devel version of the description file to the current release of the
> package?
>
> Thanks,
>
> Daniel
>
> <
> https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail
> >
> Virus-free.www.avast.com
> <
> https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail
> >
> <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
>
>         [[alternative HTML version deleted]]
>
> _______________________________________________
> Bioc-devel using r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel
>

	[[alternative HTML version deleted]]