Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MisMerge #474

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Add MisMerge #474

merged 2 commits into from
Oct 19, 2023

Conversation

BearToCode
Copy link
Contributor

I added MisMerge, a merge editor I made myself for SvelteKit

@netlify
Copy link

netlify bot commented Oct 19, 2023

Deploy Preview for sveltesociety-preview ready!

Name Link
🔨 Latest commit 06eeec5
🔍 Latest deploy log https://app.netlify.com/sites/sveltesociety-preview/deploys/6531a6791acb050008438250
😎 Deploy Preview https://deploy-preview-474--sveltesociety-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@MacFJA
Copy link
Collaborator

MacFJA commented Oct 19, 2023

The lint failed on the components.json.
Can you run pnpm run format to fix it ?

Also, the file changed in the meantime, can you also rebase your branch with main?

@BearToCode
Copy link
Contributor Author

Should be ok now

@MacFJA MacFJA merged commit 416df50 into svelte-society:main Oct 19, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants