search

Spaceface16518 / strat-collector

Combs through a specific subreddit for posts with over a certain threshold in comments. It then adds them to a database.
MIT License
2 stars 0 forks source link

Merge TypeScript Branch #6

Closed Spaceface16518 closed 6 years ago

Spaceface16518 commented 6 years ago

This is the new project, the master branch is 8 commits behind this. They merge just fine, it is just the .env folder that is causing trouble.

Spaceface16518 commented 6 years ago

Turns out the gitignore file was the problem. Since gitignore files are formatted like this:

1|Ignore-this-file
2|Ignore-this-as-well
3|etc

The gitignore was not merging because there were different files taking up the same line. The commit d98d8a9 solved this. This branch is ready for merging.