Closed osdiab closed 3 years ago
Hmm, not sure how to best resolve this one. A bit to sketchy in the Github webeditor. I don't have experience with merging from forks. Should I do something or should you? :)
...and this snapshot test will quickly become a pain I see 🤦
Also, I'll bump the patch version once this is merged and I have tested a bit on my own project. Still doing releases by hand here ;)
I think this is easiest:
yarn test
to regenerate the snapshotgit commit
, to complete the merge commiti just did the merge, so should be good now - the snapshot diff looked like this:
Thanks for fixing it :)
I think this is easiest:
- Open terminal, check out this branch
- merge main into this branch
- there will be conflicts on that snapshot file - just rerun
yarn test
to regenerate the snapshot- make sure the snapshot makes sense
git commit
, to complete the merge commit- push that, and you should be good to merge this into main
Thanks for taking the time to explain! But I do know how to resolve conflicts. The thing was, that I couldn't checkout this branch (osdiab:osdiab/quote-and-escape-routes
) as it comes from your fork. Guess I would need access to your fork and resolve them there or have you do it as you did :9
Ah I figured there was some way for you to check it out since when I make the PRs it has a checkbox to allow edits from maintainers - lol maybe there is but idk. As more stuff comes up I'll try to deal with conflicts like that when they come :)
Closes #14
Ensures that it always produces valid typescript even if hyphens are in the path name.