Hi Anand, I’m not sure if the configuration on your machine is compromised in some way, but most likely everything is fine.
I tested the exact same commands as you have and it seems to have worked. Steps: 10871 git clone https://github.com/PoisonAlien/maftools.git 10872 cd maftools 10873 git remote add upstream g...@git.bioconductor.org:packages/maftools 10874 git fetch —all 10875 git merge upstream/master <This is where I have a merge conflict> 10879 emacs DESCRIPTION <remove the bad version number marked as HEAD> 10881 git commit [master 579af19] Merge remote-tracking branch 'upstream/master' 10883 git log —oneline <Show a smooth commit history> 10884 git status git push upstream master Counting objects: 54, done. Delta compression using up to 4 threads. Compressing objects: 100% (31/31), done. Writing objects: 100% (54/54), 9.84 KiB | 9.84 MiB/s, done. Total 54 (delta 38), reused 37 (delta 22) To git.bioconductor.org:packages/maftools 8a302b3..579af19 master -> master You should have your git.bioconductor.org:packages/maftools repo synced with your GitHub now. Please check. Best, Nitesh > On Dec 18, 2018, at 11:12 AM, Turaga, Nitesh <nitesh.tur...@roswellpark.org> > wrote: > > Hi Anand, > > The issue is the way you have updated your version numbers. > > Note that the last commit on upstream/master was the release version bump > where your package has a version “1.9.0”. Please update the version to > “1.9.1” and try pushing after the merge. I’ve outlined the steps you should > take to push successfully below. > > > Post release, you are first supposed to sync before making changes. This is > the protocol. > > 1. Sync your master with upstream/master. > 2. Test your push. > 3. Add new changes, > 4. Update the version as a new commit. > 5. Push to GitHub and git.bioconductor. > > Please try this and let me know if you are able to push. > > Best, > > Nitesh > >> On Dec 18, 2018, at 10:18 AM, Anand MT <anand...@hotmail.com> wrote: >> >> g...@git.bioconductor.org:packages/maftools.git > > > > 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 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
