[R-pkg-devel] GitHub error

[Spencer Graves]

Hi, Andrew:  Thanks.  I think that was exactly what I needed:  I was in 
particular unsure about "git push --force".  Spencer Graves


On 4/20/22 8:22 PM, Andrew Simmons wrote:
> Not really the place for this type of thing, but here's what I'd do:
> 
> add .DS_Store to your .gitignore file, this should ignore both
> .DS_Store and inst/.DS_Store
> delete both .DS_Store files from your repository
> then try to pull again. You can use --force in git push, that should
> force them to combine, ignoring the overwrite warning
> 
> On Wed, Apr 20, 2022 at 9:17 PM Spencer Graves
> <spencer.graves using effectivedefense.org> wrote:
>>
>> Hello, All:
>>
>>
>>            When I do "git pull", I get "error: Your local changes to the
>> following files would be overwritten by merge: .DS_Store .gitignore
>> inst/.DS_Store".
>>
>>
>>            I've done "git rm --cached .DS_Store", etc., which some web page told
>> me would remove ".DS_Store" from GitHub but not from my local copy.
>> Then when I try, "git push", I get "! [rejected] // master -> master
>> (non-fast-forward) // error: failed to push some refs to
>> 'github.com:JamesRamsay5/fda.git'".
>>
>>
>>            What do you suggest?  Manually delete those files from the GitHub
>> repository?
>>
>>
>>            Thanks,
>>            Spencer Graves
>>
>>
>> p.s.  This is with "https://github.com/JamesRamsay5/fda".
>>
>> ______________________________________________
>> R-package-devel using r-project.org mailing list
>> https://stat.ethz.ch/mailman/listinfo/r-package-devel