search

TriliumNext / Docs

Documentation for TriliumNext
https://triliumnext.github.io/Docs/
5 stars 7 forks source link

Renamed Docuemnt concept to Database, reviewed database.md #93

Closed root-hal9000 closed 2 months ago

root-hal9000 commented 2 months ago

Issue #32

root-hal9000 commented 2 months ago

question: we have renamed all the .md files - do they need to be updated in the meta.json file?

zerebos commented 2 months ago

question: we have renamed all the .md files - do they need to be updated in the meta.json file?

to make it importable into Trilium perfectly then yes

root-hal9000 commented 2 months ago

LGTM 👍

Looks good to merge? I am bad with acronyms 😂

root-hal9000 commented 2 months ago

question: we have renamed all the .md files - do they need to be updated in the meta.json file?

to make it importable into Trilium perfectly then yes

Ok, I will raise an issue to do that separately then.

zerebos commented 2 months ago

LGTM 👍

Looks good to merge? I am bad with acronyms 😂

LGTM = Looks Good To Me

Alumniminium commented 2 months ago

Please don't approve PRs that have merge conflicts lmao, i guess you just volunteered to resolve them :laughing:

meichthys commented 2 months ago

I did mean "Looks good to me", but I could see why it could be read as "Looks good to merge" 😁 @root-hal9000 You should be all set to merge 👍

root-hal9000 commented 2 months ago

@meichthys thanks for fixing the merge conflicts - I didn't have time to look at them before leaving. In resolving them, I think you accidentally got those two files back to having links to the old file name (document.md rather than database.md). I made one more commit to fix that, merging now

meichthys commented 2 months ago

Sorry about that, I was In a rush today and I shouldn't have tried to tackle it.

root-hal9000 commented 2 months ago

Sorry about that, I was In a rush today and I shouldn't have tried to tackle it.

nope, same here, should have looked at conflict before requesting review. thank you!