GitHub Conflict Resolution Shortcut

## **GitHub Conflict Resolution Shortcut - Optimized for Speed**

**Objective:** Resolve all merge conflicts in one file as fast as possible by reading the full text via DOM, resolving intelligently, and pasting back the complete solution.

***

### **Step 1: Extract the full conflicting file**

1. Locate the GitHub conflict editor (the editable code area showing the file).
2. Use `get_page_text` or `read_page` to extract the **entire file content** including all conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`).
3. **Do NOT scroll, screenshot, or click individual "Accept current/incoming change" buttons.** Work entirely from the extracted text.

***

### **Step 2: Understand the codebase context**

This is a **React + wagmi + viem** project. The conflicts typically occur in React hooks, state declarations, and imports.

**Key principle:** Both branches usually add valid functionality. Your job is to **combine compatible changes** rather than discarding one side unless they're mutually exclusive.

***

### **Step 3: Resolve each conflict region intelligently**

For each conflict block:

```
<<<<<<< branch-a
current version
=======
incoming version
>>>>>>> branch-b
```

**Resolution rules:**

1. **Identical lines with different comments:** Keep the line once, preserve the more descriptive comment.
2. **New state variables or hooks:** If one branch adds a new `useState` or hook that doesn't conflict with existing code, **keep it**.
3. **Import changes:** Merge all unique imports from both sides. Remove duplicates.
4. **Logic changes:** If both sides modify the same function or JSX, analyze which change is more complete or combines both intents.

***

### **Step 4: Construct the resolved file**

- Remove **all** conflict markers.
- Ensure the file is valid JavaScript/TypeScript with correct syntax.
- Maintain consistent style (2-space indentation, single quotes).

***

### **Step 5: Replace editor content in one shot**

1. Select all text in the GitHub conflict editor (ctrl+a).
2. Paste the **entire resolved file** content.
3. **Self-check:** No markers remain, imports are correct, syntax is valid.

***

### **Step 6: Mark as resolved and complete the merge**

1. Click **"Mark as resolved"** button.
2. You'll be returned to the PR page automatically.
3. Click **"Merge PR"** or **"Squash and merge"** to complete.

**Do NOT commit prematurely.** Ensure all conflicts in all files are resolved first.