HTTPS vs SSH in GitHub Cloning

[revanth3309]

What is a merge conflict?
What is the difference between HTTPS and SSH in GitHub cloning?

[janithsuraweera]

1️⃣ What is a Merge Conflict?

A merge conflict happens when Git tries to merge two branches, but finds changes in the same part of a file that it cannot automatically resolve.

• Example:
  You and your teammate both edit index.html at the same line. Git doesn’t know whose change to keep → merge conflict occurs.

• How to fix:

  1. Open the conflicted file.
  2. Look for Git markers:

     <<<<<<< HEAD
     Your changes
     =======
     Teammate’s changes
     >>>>>>> branch-name
     

  3. Decide which version to keep (or combine both).
  4. Save the file, then:

     git add filename
     git commit -m "Resolve merge conflict"

💡 Tip: Merge conflicts are normal in teamwork. Communicate and review carefully before resolving.

---

2️⃣ Difference Between HTTPS and SSH in GitHub Cloning

When cloning a repo, GitHub provides two URLs: HTTPS and SSH.

Feature	HTTPS	SSH
URL Example	https://github.com/user/repo.git	[email protected]:user/repo.git
Authentication	Username + Password (or Personal Access Token)	SSH key pair (public/private)
Setup	Simple, works immediately	Needs SSH key setup on GitHub
Security	Encrypted, but needs password/PAT each time	Encrypted, passwordless after setup
Use Case	Quick cloning, simple projects	Frequent pushes, secure, recommended for devs

Summary:

• HTTPS → easier to start, needs token/password.
• SSH → slightly more setup, smoother & secure for regular work.

---

Happy coding & merging! 🚀

[pasindupiumal03]

@revanth3309

🔹 What is a merge conflict?

It’s when Git can’t automatically merge changes because the same part of a file was edited differently. You just need to open the file, choose which changes to keep (or combine them), then commit.

🔹 What’s the difference between HTTPS and SSH in GitHub cloning?

HTTPS → Easy to set up, but you may have to enter credentials often.

SSH → Needs a one-time setup with keys, but after that it’s secure and you don’t have to log in each time.