Tim Sehn
Tim Sehn
> I cant even merge after I have dropped the table in `main` It's better to give us reproduction steps. I'm not sure I would expect a branch with a...
If you cut a branch off the tip where the table does not exist and then do the modifications on a branch, that will merge.
I'm trying to help with this in the next couple hours.
It looks like from the diff, all you diff was rename 'fullTimeEmployees' to 'full_time_employees'. We're not sure why this is throwing a conflict.
Sorry for the poor experience. We're looking into what is going on. Glad it is not urgent any more :-)
I'm resolving in favor of the. more specific #3963
> I'm not sure about points 2 and 3, as defaulting to reading/writing to one of the directories could resulting in different behavior depending on where you run `dolt sql`...
> Options 1 and 2 seem like they'll only delay the conflict – customers will still hit them, but it'll likely take them longer to hit them since they have...
OK @JCOR11599. Just make this directory when we actually need to write a file in it. I think that delays the issue long enough for a user to experience enough...
This is fixed. We went with option (1).