Hello, we already have a step-by-step guide for resolving merge conflicts using GitHub's web interface. Now we need your help to create a companion guide that walks users through the process using their local terminal.

✍️ What to Do

Write a new Markdown guide under:

Guides/Conflicts_Guide/cli_guide.md

The guide should explain how a contributor can:

1. Clone the repository and switch to a conflict branch (provided via an issue comment or known name).
2. Simulate or handle a merge conflict between the main branch and the conflict branch.
3. Use commands like:
   • git fetch
   • git checkout
   • git merge
   • git status, git diff
   • and git add / git commit
4. Push their resolved changes to their forked repo.
5. Open a Pull Request and reference the original issue using Closes #issue-number.

✅ Tips

• Use a friendly, beginner-friendly tone.
• Feel free to add code blocks and terminal output examples.
• Mention that a GitHub UI-based version of the guide already exists.
• Add a short note at the end recommending Git GUIs (like GitHub Desktop or VS Code) for users who aren't comfortable with the terminal yet.

Optional - Add a rough outline or bullet points

No response