v Sharma
Sent: Wednesday, May 3, 2023 9:49 AM
To: Kern, Lori ; bioc-devel@r-project.org
Subject: Re: [Bioc-devel] Error pushing changes to upstream
Hi,
Thanks for your reply. Yes, that's what I did. Here are the commands before
`git push`:
```
> git rm DESCRIPTION~
rm 'DESCRIPT
merge conflict markers are not checked in already, but in this
case, they are already in the repo.
Let me know if you need any other information.
Best,
Gaurav
From: Kern, Lori
Sent: Wednesday, May 3, 2023 9:33 AM
To: bioc-devel@r-project.org ; Gaurav Sharma
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 Biostat
