[Bioc-devel] Error pushing changes to upstream

[Gaurav Sharma]

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 'git using 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]]