docs: add CLI merge conflicts guide #30

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

Open

Nomzy-kush wants to merge 1 commit into rezzcode:main from Nomzy-kush:docs/cli-merge-guide

Nomzy-kush commented Nov 10, 2025

This PR adds a beginner-friendly guide for resolving merge conflicts using the Git CLI.

Closes #16

Explained git fetch, merge, and conflict resolution workflow
Added examples and CLI outputs
Added note for beginners about GitHub Desktop and VS Code


          docs: add CLI merge conflicts guide

4c440b0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet