Are you able to do a
git rm DESCRIPTION~
and
git commit
those changes?
Removing l ocally if it is already checked in means you have to do a git rm to
remove from git repo.
Cheers,
Lori Shepherd - Kern
Bioconductor Core Team
Roswell Park Comprehensive Cancer Center
Department of Biostatistics & Bioinformatics
Elm & Carlton Streets
Buffalo, New York 14263
________________________________
From: Bioc-devel <bioc-devel-boun...@r-project.org> on behalf of Gaurav Sharma
via Bioc-devel <bioc-devel@r-project.org>
Sent: Wednesday, May 3, 2023 12:33 AM
To: bioc-devel@r-project.org <bioc-devel@r-project.org>
Subject: [Bioc-devel] Error pushing changes to upstream
Hi,
I am a developer of the package proejctR. Following the FAQ, I have checked
that I have R W access to projectR and my upstream is configured correctly. I
get the following error on git push:
```
Counting objects: 2, done.
Delta compression using up to 12 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 235 bytes | 5.00 KiB/s, done.
Total 2 (delta 1), reused 0 (delta 0)
remote: Error: You cannot push without resolving merge conflicts.
remote:
remote: Please check the files in the commit pushed to the git-server
remote: for merge conflict markers like '<<<<<<<', '========', '>>>>>>>'.
remote:
To git.bioconductor.org:packages/projectR.git
! [remote rejected] devel -> devel (pre-receive hook declined)
error: failed to push some refs to
'g...@git.bioconductor.org:packages/projectR.git'
```
I believe this is due to a file named DESCRIPTION~ in the repo upstream (on
Bioconductor). The file does have merge conflict markers. However, I removed
the file locally, performed a commit, and got the error while git push. That's
the only change I did and I didn't do any merge. So, the error is a bit
misleading.
I am unable to push the removal of DESCRIPTION~ upstream from my end, and I
think this is causing the error. If someone could remove the file and help with
this issue, I'll appreciate it.
Thank you.
Best,
Gaurav
[[alternative HTML version deleted]]
_______________________________________________
Bioc-devel@r-project.org mailing list
https://secure-web.cisco.com/1pchIcqFTrYIP6xoiFuAdN5qp1escj-BLtj5KULR7drSyzv8aISDzs7ifW3hQCZHJenGHbobHDSoUd_4WFAztFLiLc8lLHGas-IKPqzCeTWAyVJI2bZBSbZ6RL6MVlfeWpMnJn_XckjMpABioTAdZB7qv7xjS8bpq55uxWN7YHRMT1QVlEowJ7KrbBxrhCQ-ksXUQkRwkXu4hQ-Apxia2FlQlyGM2ZjCuTTUjaguuTPYhRFINX24ZhQREruJ7ul-EPZeeqAVyZXtyzM5Wf6dfTVXB2uTMOa4BOo2oDBG5js_qhqfbVZohbM3cp66YLkkE/https%3A%2F%2Fstat.ethz.ch%2Fmailman%2Flistinfo%2Fbioc-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.
[[alternative HTML version deleted]]
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
