routeTree.gen.ts is locked but it has merge conflicts
Hey what is the best way to deal with such situations?
7 Replies
genetic-orange•3mo ago
just accept all changes and then regenerate
foreign-sapphireOP•3mo ago
Doesn't work since its locked.
It works when I click "Resolve in Merge Editor"
Does it work in VSCode - I'm in Cursor
genetic-orange•3mo ago
then unlock for this session
foreign-sapphireOP•3mo ago
Well, doing a tutorial on background agents and telling people to unlock routetree on every change is... complicated :/
does it have to be in git?
genetic-orange•3mo ago
ah i see. no it does not have to be in git
it's regenerated prior to building
foreign-sapphireOP•3mo ago
ok then i remove it from the starter project.
>it's regenerated prior to building
I had some problems with it lately (alpha) but lets see if it works
thanks
genetic-orange•3mo ago
fixed a lot of regressions there, if you find anything, let me know