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.

Sign up for GitHub

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

Jump to bottom

Add FAQ on how to resolve merge conflicts #70

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Add FAQ on how to resolve merge conflicts #70

merged 2 commits into from
Oct 24, 2024

Conversation

rithviknishad
Copy link
Member

@rithviknishad rithviknishad commented Oct 24, 2024 •
edited
Loading

  • Add FAQ on how to resolve merge conflicts
  • Adds support for bash script syntax highlighting

@netlify Netlify
Copy link

netlify bot commented Oct 24, 2024 •
edited
Loading

✅ Deploy Preview for docs-ohc ready!

Name Link
🔨 Latest commit 01945f3
🔍 Latest deploy log https://app.netlify.com/sites/docs-ohc/deploys/6719bea7cad77f000893e6a6
😎 Deploy Preview https://deploy-preview-70--docs-ohc.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.

@gigincg gigincg merged commit 2a7c4ab into master Oct 24, 2024
4 checks passed
@gigincg gigincg deleted the faq-merge-conflicts branch October 24, 2024 03:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sainak sainak Awaiting requested review from sainak

@gigincg gigincg Awaiting requested review from gigincg

@bodhish bodhish Awaiting requested review from bodhish

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rithviknishad @gigincg