search

nc-minibbs / mbbs

A repository for the Mini-Bird Breeding Survey data
https://minibbs.us
Other
2 stars 0 forks source link

ignore files inside inst/scratch #46

Closed IJBG closed 4 months ago

IJBG commented 5 months ago

The files inside of inst/scratch should be ignored again on the master branch, it's causing problems for me switching between master (with an empty scratch folder) and the species_comments branch (with a not empty scratch folder) where git keeps trying to delete the scratch folder and failing.

This is the error I get: $ git checkout master Deletion of directory 'inst/scratch' failed. Should I try again? (y/n) n

I'd like to merge the new stop level folder location into my species_comments branch from main, this is also causing a problem there. I had to abort a merge bc it was suggesting deleting everything in scratch (where I'm keeping my draft workflow, which will eventually get cleaned up when I'm done with the branch)

I think this should fix it? Let me know if there's a better way to do this, and if "inst/scratch/*" is the best way to add to the gitignore or not

bsaul commented 5 months ago

I think this should fix it?

I think so, yes. Though you may need to git rebase --origin master from the species_comments after this PR is merged into master.