How to resolve merge conflicts in GitHub Pull Requests?

[avlok3]

Select Topic Area

Question

Body

Hi, my name is Soniya.I encountered a merge conflict while trying to merge my feature branch into the main branch via a pull request. What are the best practices to resolve it directly on GitHub or locally using Git?

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬

[rishabhrawat05]

Hey, @avlok3

On GitHub

1. Open the pull request.
2. Click “Resolve conflicts”.
3. Edit the file to keep the correct version and remove conflict markers (<<<<<<<, =======, >>>>>>>).
4. Click “Mark as resolved”, then “Commit merge”.

---

Locally using Git

1. Pull latest main:

   git checkout main
   git pull origin main

2. Switch to your branch:

   git checkout feature-branch

3. Merge main:

   git merge main

4. Fix conflicts in files (look for conflict markers), then run:

   git add .
   git commit -m "Resolved conflicts"
   git push origin feature-branch

Hope this will help you to resolve conflicts

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬

[Vedant1607]

When you encounter a merge conflict while merging a feature branch into the main branch via a pull request, you can resolve it in two ways:

1. On GitHub (for small conflicts):

• Click “Resolve conflicts” in the pull request.
• Manually edit the conflicting lines between <<<<<<<, =======, and >>>>>>>.
• Click “Mark as resolved” and then “Commit merge”.

2. Locally using Git (for complex conflicts):

git checkout main  
git pull origin main  
git checkout feature-branch  
git merge main  

Manually resolve conflicts in your code editor.

After resolving, run:

```bash
git add .
git commit -m "Resolved merge conflict"
git push origin feature-branch

The pull request will update and become mergeable.

---

✅ Best Practices:

• Understand the conflict before resolving.
• Test your code after resolving.
• Keep your commit history clean (consider rebasing if necessary).

[R41CY]

---

Hey Soniya,
Merge conflicts are common when multiple people change the same parts of a file. Here’s how you can handle it:

🔧 Option 1: Resolve Locally (Best for most cases)

1. Pull the latest from main:

   git checkout your-feature-branch
   git fetch origin
   git merge origin/main

2. Git will tell you where the conflicts are (you'll see <<<<<<<, =======, >>>>>>> in the code).

3. Open the conflicting files and fix them manually.

4. Then:

   git add .
   git commit
   git push

Now your PR will update and the conflict should be gone.

---

🧰 Option 2: Resolve on GitHub (if small)

1. Go to the PR.
2. If GitHub shows a “Resolve conflicts” button, click it.
3. Use the editor to fix the conflicts and mark them as resolved.
4. Commit the changes.

---

Best Practice: Always sync your branch with main regularly to avoid big conflicts later.

Let me know if you want exact steps for a specific tool like VS Code or GitHub Desktop.

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬