search

Rotonde / beaker

Rotonde client with user account combined(deprecated)
MIT License
205 stars 37 forks source link

Add default config files back #19

Closed lsjroberts closed 7 years ago

lsjroberts commented 7 years ago

Sorry about this.

So it looks like we need to keep the defaults in here. Otherwise whenever someone pulls they'll lose their dat.json and portal.json files.

You should run this instead to avoid future conflicts, as per https://stackoverflow.com/a/40272289:

git update-index --skip-worktree dat.json
git update-index --skip-worktree portal.json

Fixes #18.

Sorry again if this caused anyone issues.

neauoire commented 7 years ago

Damn, I lost my whole feed.

pfrazee commented 7 years ago

@neauoire you can find it in your history

pfrazee commented 7 years ago

@neauoire more specifically, in the history tab of the library

lsjroberts commented 7 years ago

I'm really sorry :( I misunderstood what it was going to do.

lsjroberts commented 7 years ago

@pfrazee oh! phew! good feature!

joehand commented 7 years ago

this should be clearer! almost lost my whole thing too. is there another solution that wouldn't require people to run those git commands?

lsjroberts commented 7 years ago

I think perhaps adding them now back into the .gitignore without running the git rm would do the trick. Perhaps. I'll leave it alone right now though as it's a bit late.