Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Raphael Bonnet
Thank you all seems in order. * cf86353 (upstream/master, origin/master, 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, origin/RELEASE_3_10) bump x.y.z version to even y prior to creation of RELEASE_3_10 branch

Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Turaga, Nitesh
Alright, last try git checkout master git branch -D RELEASE_3_10 git checkout -b RELEASE_3_10 upstream/RELEASE_3_10 git push -f origin RELEASE_3_10 This has to work. Otherwise add me as a collaborator to https://github.com/Peyronlab/MACSQuantifyR. I'll force

Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Raphael Bonnet
It shows fatal: 'RELEASE_3_10' branch already exist Le 22/01/2020 à 16:28, Turaga, Nitesh a écrit : Ok, try this instead git checkout -b RELEASE_3_10 origin/RELEASE_3_10 git reset --hard a724b95802b94cb096b592d716ddaf2b263e71bd git push. -f origin RELEASE_3_10 On

Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Turaga, Nitesh
Ok, try this instead git checkout -b RELEASE_3_10 origin/RELEASE_3_10 git reset --hard a724b95802b94cb096b592d716ddaf2b263e71bd git push. -f origin RELEASE_3_10 > On Jan 22, 2020, at 10:26 AM, Raphael Bonnet > wrote: > > Hi Nitesh, > > This is what I previously

Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Raphael Bonnet
Hi Nitesh, This is what I previously tried but it does not affect (origin/RELEASE_3_10), here are the outputs I get : > git checkout origin/RELEASE_3_10 Note: checking out 'origin/RELEASE_3_10'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit

Re: [Bioc-devel] Help git package maintaining

2020-01-22 Thread Turaga, Nitesh
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

[Bioc-devel] Help git package maintaining

2020-01-22 Thread Raphael Bonnet
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