search

chase-moskal / xiome

open-source cloud-powered web components
https://xiome.io/
MIT License
10 stars 13 forks source link

Notes style #126

Closed Tuasegun closed 2 years ago

Tuasegun commented 2 years ago

I'm trying to merge send this pr after git fetch --all, it's coming up with conflicts and I don't want to pull

chase-moskal commented 2 years ago

hello. this git history is still very convoluted.

awhile back, i had squashed the whole branch down into a single commit, on branch nstyles, that you could continue from.

i advise that you either switch to that branch, or squash your whole branch down into a single commit -- we can't merge this work with such convoluted history, so the first step is to squash the branch to make it more manageable.

@LewBlu is also interested in this ticket, so you might have some friendly competition, or somebody to collaborate with this on.

chase-moskal commented 2 years ago

closing in favor of #127