Hi Rafael,
Please try the following
git checkout origin/RELEASE_3_10
git reset --hard a724b95802b94cb096b592d716ddaf2b263e71bd
This is the cleanest way to achieve what you need.
Please also keep in mind to back up your entire folder in another directory
should something go wrong.
Best,
Nitesh
> On Jan 22, 2020, at 9:08 AM, Raphael Bonnet
> <raphael.bon...@univ-cotedazur.fr> wrote:
>
> Hi everyone,
>
> I'm struggling to understand how to maintain the two version of the my
> package through git.
> This is my first package and you will probably guess that I'm not very
> used to working with multiple branches and remotes.
>
> I've read the documentation and understood that the master branch
> correspond to the devel version of my package and that the RELEASE_X_Y
> correspond to the release version.
> I'm also aware of the numbering practices (even/odd) regarding theses
> versions.
>
> I tried to fix a bug, and had to ask the maintainer team to fix some of
> the mess I made with the aforementioned version numbers.
>
> Now I'm at the current state in my github branches
>
> * 7ae946b (origin/RELEASE_3_10) update RELEASE version number
> | * cf86353 (master, upstream/master, origin/master) bump x.y.z version
> to odd y after creation of RELEASE_3_10 branch
> |/
> * a724b95 (HEAD -> RELEASE_3_10, upstream/RELEASE_3_10) bump x.y.z
> version to even y prior to creation of RELEASE_3_10 branch
> * 160de7a installation commands updated in readme.md
>
> the upstream/RELEASE_3_10 was updated by the Bioc team, and commit
> a724b95 needs to stay that way before I start fixing the bug.
> My 7ae946b (origin/RELEASE_3_10) commit correspond to small changes
> (including the version number mess I previously mentioned) that I made.
>
> How can I discard this so that the (origin/RELEASE_3_10) remote would
> fall back to RELEASE_3_10 (a724b95) correct commit ?
>
> Could you provide a safe way to achieve that?
>
> The package name is MACSQuantifyR.
>
> Thanks for your responses,
>
> --
> *Raphaël*
>
> [[alternative HTML version deleted]]
>
> _______________________________________________
> Bioc-devel@r-project.org mailing list
> https://stat.ethz.ch/mailman/listinfo/bioc-devel
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
