Ben Awad

> But I think we must implement this under a config option / cli flag and not make it the default. How come?

How does it break down for multiple entry points?

What do you think of collapsing it only if the folders name is `index`?

that's a good point, I think merging is probably the right choice, but I'll think on this.

We are using `git mv`, so I think that should prevent any merge conflicts related to the file being moved/renamed. Haven't tested that yet though, so not 100% sure.

@ganapativs What would be the sequence of steps to replicate the conflict? Are you thinking: User 1 git move a file User 2 make a change in that file then...

I just went through the regular installation: https://github.com/oh-my-fish/oh-my-fish#installation

yeah

`--remove-orphans` came to mind, but `--remove-non-imported-only` is more descriptive

I'm not against it, but it's usually easier to find pngs than svgs for logos