mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-27 12:22:27 +00:00
Remove documentation files - keep only code changes
Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
parent
1607aea793
commit
c9bee6cf0a
132
PR40_INDEX.txt
132
PR40_INDEX.txt
@ -1,132 +0,0 @@
|
||||
================================================================================
|
||||
PR #40 RESOLUTION GUIDE - FILE INDEX
|
||||
================================================================================
|
||||
|
||||
Total Documentation: 4 files, 566 lines, ~14.5 KB
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
FILE OVERVIEW:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
1. README_PR40.md (150 lines, 3.5 KB) ⭐ START HERE
|
||||
Purpose: Main overview and entry point
|
||||
Contents:
|
||||
- Problem summary
|
||||
- Quick links to all guides
|
||||
- Super quick 5-command solution
|
||||
- Technical details
|
||||
- Impact analysis
|
||||
Audience: Everyone
|
||||
Time to read: 3 minutes
|
||||
|
||||
2. QUICK_REBASE_GUIDE.md (117 lines, 2.5 KB) ⚡ FASTEST
|
||||
Purpose: Immediate action guide
|
||||
Contents:
|
||||
- 5 commands to copy/paste
|
||||
- Expected output at each step
|
||||
- One-liner alternative
|
||||
- Quick troubleshooting
|
||||
Audience: Experienced git users
|
||||
Time to execute: 2 minutes
|
||||
|
||||
3. REBASE_INSTRUCTIONS.md (142 lines, 4.5 KB) 📚 COMPREHENSIVE
|
||||
Purpose: Detailed step-by-step guide
|
||||
Contents:
|
||||
- Complete instructions
|
||||
- 3 different approaches (manual, CLI, cherry-pick)
|
||||
- Full troubleshooting section
|
||||
- Verification steps
|
||||
- Safety notes
|
||||
Audience: Those wanting full context
|
||||
Time to read: 8 minutes
|
||||
|
||||
4. REBASE_VISUAL_GUIDE.md (157 lines, 4.1 KB) 🎨 VISUAL
|
||||
Purpose: Visual understanding
|
||||
Contents:
|
||||
- Before/after commit graphs
|
||||
- ASCII diagrams
|
||||
- Conflict code with annotations
|
||||
- Visual step-by-step
|
||||
Audience: Visual learners
|
||||
Time to read: 10 minutes
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
USAGE RECOMMENDATIONS:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
SCENARIO 1: "Just fix it quickly"
|
||||
→ Open: QUICK_REBASE_GUIDE.md
|
||||
→ Run the 5 commands
|
||||
→ Done in 2 minutes
|
||||
|
||||
SCENARIO 2: "I want to understand what I'm doing"
|
||||
→ Start: README_PR40.md (overview)
|
||||
→ Then: REBASE_INSTRUCTIONS.md (details)
|
||||
→ Execute with confidence
|
||||
|
||||
SCENARIO 3: "I'm a visual learner"
|
||||
→ Start: README_PR40.md (context)
|
||||
→ Then: REBASE_VISUAL_GUIDE.md (diagrams)
|
||||
→ Follow visual steps
|
||||
|
||||
SCENARIO 4: "I've never rebased before"
|
||||
→ Read all 4 files in order
|
||||
→ Start with README_PR40.md
|
||||
→ Total time: 20 minutes
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
KEY INFORMATION:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
Problem: PR #40 has merge conflicts
|
||||
Cause: Base branch updated with features from your PR
|
||||
Solution: Rebase to remove redundant commits
|
||||
|
||||
Current State:
|
||||
- Branch: copilot/sub-pr-39 @ 6e2a9a4
|
||||
- Base: fix/buff-suppression-pet-restore @ b19503a
|
||||
- Status: Conflicting (4 commits)
|
||||
|
||||
Target State:
|
||||
- Branch: copilot/sub-pr-39 @ f94cb8d (after rebase)
|
||||
- Base: fix/buff-suppression-pet-restore @ b19503a
|
||||
- Status: Clean (2 commits)
|
||||
|
||||
The Solution (5 commands):
|
||||
1. git checkout copilot/sub-pr-39
|
||||
2. git fetch origin
|
||||
3. git rebase origin/fix/buff-suppression-pet-restore
|
||||
4. git rebase --skip
|
||||
5. git push --force-with-lease origin copilot/sub-pr-39
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
SAFETY NOTES:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
✓ Your Levitate code is preserved
|
||||
✓ No data loss
|
||||
✓ Can abort with: git rebase --abort
|
||||
✓ Using --force-with-lease prevents accidental overwrites
|
||||
✓ All instructions tested and verified
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
LINKS:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
GitHub PR: https://github.com/Valorith/Server/pull/40
|
||||
Repository: https://github.com/Valorith/Server
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
SUPPORT:
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
If stuck:
|
||||
1. Check troubleshooting in REBASE_INSTRUCTIONS.md
|
||||
2. Run: git rebase --abort (to start over)
|
||||
3. Review REBASE_VISUAL_GUIDE.md for clarity
|
||||
|
||||
All guides include detailed help sections.
|
||||
|
||||
================================================================================
|
||||
LAST UPDATED: 2026-01-31
|
||||
================================================================================
|
||||
@ -1,117 +0,0 @@
|
||||
# Quick Reference: Resolve PR #40 in 5 Steps
|
||||
|
||||
## TL;DR - Just Run These Commands
|
||||
|
||||
```bash
|
||||
# 1. Switch to PR branch
|
||||
git checkout copilot/sub-pr-39
|
||||
|
||||
# 2. Fetch latest
|
||||
git fetch origin
|
||||
|
||||
# 3. Start rebase
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
|
||||
# 4. Skip the conflicting commit (when prompted)
|
||||
git rebase --skip
|
||||
|
||||
# 5. Force push
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
**Done!** PR #40 will now be mergeable.
|
||||
|
||||
---
|
||||
|
||||
## What You'll See
|
||||
|
||||
### Step 3 Output:
|
||||
```
|
||||
Rebasing (1/4)
|
||||
Rebasing (2/4)
|
||||
Rebasing (3/4)
|
||||
Auto-merging zone/spell_effects.cpp
|
||||
CONFLICT (content): Merge conflict in zone/spell_effects.cpp
|
||||
error: could not apply 597e6eb... Add validation check
|
||||
```
|
||||
|
||||
**This is expected!** → Go to Step 4
|
||||
|
||||
### Step 4 Output:
|
||||
```
|
||||
Rebasing (4/4)
|
||||
dropping 6e2a9a4... Resolve merge conflict -- already upstream
|
||||
Successfully rebased and updated refs/heads/copilot/sub-pr-39.
|
||||
```
|
||||
|
||||
**Success!** → Go to Step 5
|
||||
|
||||
### Step 5 Output:
|
||||
```
|
||||
To https://github.com/Valorith/Server
|
||||
6e2a9a4..f94cb8d copilot/sub-pr-39 -> copilot/sub-pr-39
|
||||
```
|
||||
|
||||
**Done!** Check PR #40 on GitHub - it should show no conflicts.
|
||||
|
||||
---
|
||||
|
||||
## Why Each Step?
|
||||
|
||||
1. **git checkout** - Make sure you're on the right branch
|
||||
2. **git fetch** - Get the latest base branch changes
|
||||
3. **git rebase** - Replay your commits on the new base
|
||||
4. **git rebase --skip** - Skip redundant commit (already in base)
|
||||
5. **git push --force-with-lease** - Update GitHub with clean history
|
||||
|
||||
---
|
||||
|
||||
## After Rebase: Verify
|
||||
|
||||
Visit: https://github.com/Valorith/Server/pull/40
|
||||
|
||||
You should see:
|
||||
- ✓ "This branch has no conflicts with the base branch"
|
||||
- ✓ Only 2 commits
|
||||
- ✓ Changes show only Levitate restoration code
|
||||
|
||||
---
|
||||
|
||||
## If Something Goes Wrong
|
||||
|
||||
**Abort and start over:**
|
||||
```bash
|
||||
git rebase --abort
|
||||
```
|
||||
|
||||
**Need more details?** Read:
|
||||
- `REBASE_INSTRUCTIONS.md` - Full instructions
|
||||
- `REBASE_VISUAL_GUIDE.md` - Visual diagrams
|
||||
|
||||
---
|
||||
|
||||
## One-Liner Alternative
|
||||
|
||||
If you trust automation:
|
||||
```bash
|
||||
git checkout copilot/sub-pr-39 && \
|
||||
git fetch origin && \
|
||||
git rebase origin/fix/buff-suppression-pet-restore && \
|
||||
git rebase --skip && \
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
⚠️ Only use if you understand what each command does!
|
||||
|
||||
---
|
||||
|
||||
## What Changes
|
||||
|
||||
**Before:** 4 commits (validation + conflict resolution + levitate + plan)
|
||||
**After:** 2 commits (levitate + plan)
|
||||
|
||||
**Result:** Clean PR with only your Levitate feature!
|
||||
|
||||
---
|
||||
|
||||
**Questions?** Check the detailed guides in this directory.
|
||||
150
README_PR40.md
150
README_PR40.md
@ -1,150 +0,0 @@
|
||||
# PR #40 Resolution Summary
|
||||
|
||||
## 📋 What You Need to Know
|
||||
|
||||
**Problem:** PR #40 cannot be merged due to conflicts with the base branch.
|
||||
|
||||
**Solution:** Follow the rebase instructions in this directory.
|
||||
|
||||
**Time Required:** ~2 minutes
|
||||
|
||||
**Difficulty:** Easy (just copy/paste 5 commands)
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Choose Your Guide
|
||||
|
||||
### Option 1: Quick & Easy (Recommended)
|
||||
📄 **QUICK_REBASE_GUIDE.md**
|
||||
- Just 5 commands to copy/paste
|
||||
- Takes 2 minutes
|
||||
- Shows expected output at each step
|
||||
|
||||
### Option 2: Detailed Explanation
|
||||
📄 **REBASE_INSTRUCTIONS.md**
|
||||
- Step-by-step with context
|
||||
- Multiple approaches
|
||||
- Troubleshooting tips
|
||||
- Verification steps
|
||||
|
||||
### Option 3: Visual Learner
|
||||
📄 **REBASE_VISUAL_GUIDE.md**
|
||||
- Diagrams and visual flow
|
||||
- Before/after commit graphs
|
||||
- Detailed conflict explanation
|
||||
- Safe to follow visualization
|
||||
|
||||
---
|
||||
|
||||
## ⚡ Super Quick Start
|
||||
|
||||
If you just want to fix it now:
|
||||
|
||||
```bash
|
||||
cd /path/to/your/local/Server/repo
|
||||
git checkout copilot/sub-pr-39
|
||||
git fetch origin
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
git rebase --skip # When you see the conflict
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
Then check: https://github.com/Valorith/Server/pull/40
|
||||
|
||||
---
|
||||
|
||||
## ❓ Why This Happened
|
||||
|
||||
The base branch (`fix/buff-suppression-pet-restore`) was updated with fixes that were originally in your PR. Now those commits are redundant and causing conflicts.
|
||||
|
||||
**Your PR had:**
|
||||
- Validation fix (`return false;` → `return;`)
|
||||
- Merge conflict resolution
|
||||
- Levitate restoration ← **This is what we keep**
|
||||
- Initial plan
|
||||
|
||||
**Base branch now has:**
|
||||
- Validation fix (already done!)
|
||||
- Nimbus restoration (already done!)
|
||||
|
||||
**After rebase, your PR will have:**
|
||||
- Levitate restoration ← **Only this!**
|
||||
- Initial plan
|
||||
|
||||
---
|
||||
|
||||
## ✅ Expected Result
|
||||
|
||||
After following the guide:
|
||||
- PR #40 shows "No conflicts with base branch"
|
||||
- Only 2 commits in the PR
|
||||
- Changes show only the Levitate feature
|
||||
- Ready to merge!
|
||||
|
||||
---
|
||||
|
||||
## 🆘 Need Help?
|
||||
|
||||
1. Read the appropriate guide above
|
||||
2. Check the troubleshooting section in REBASE_INSTRUCTIONS.md
|
||||
3. If stuck: `git rebase --abort` to start over
|
||||
|
||||
---
|
||||
|
||||
## 📊 Impact
|
||||
|
||||
**What Changes:**
|
||||
- Number of commits: 4 → 2
|
||||
- Merge status: Conflicting → Clean
|
||||
- Changes: Validation + Nimbus + Levitate → Levitate only
|
||||
|
||||
**What Stays the Same:**
|
||||
- Your Levitate restoration code
|
||||
- The functionality being added
|
||||
- The PR goal and description
|
||||
|
||||
**What's Different:**
|
||||
- Cleaner commit history
|
||||
- No redundant commits
|
||||
- Inherited features from base branch
|
||||
|
||||
---
|
||||
|
||||
## 🔍 Files Modified
|
||||
|
||||
The rebase only affects Git history. Your code changes remain:
|
||||
- `zone/spell_effects.cpp` (lines 4722-4735)
|
||||
|
||||
The validation and nimbus changes are still there - they're just inherited from the base branch now instead of being in your commits.
|
||||
|
||||
---
|
||||
|
||||
## 📝 Technical Details
|
||||
|
||||
**Current Branch:** `copilot/sub-pr-39` at `6e2a9a4`
|
||||
**Base Branch:** `fix/buff-suppression-pet-restore` at `b19503a`
|
||||
**After Rebase:** `copilot/sub-pr-39` at `f94cb8d` (new)
|
||||
|
||||
**Commits to Remove:**
|
||||
- `597e6eb` - Add validation check (redundant)
|
||||
- `6e2a9a4` - Resolve merge conflict (redundant)
|
||||
|
||||
**Commits to Keep:**
|
||||
- `950e644` → `dee427b` - Initial plan
|
||||
- `03f7704` → `f94cb8d` - Add Levitate restoration
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Bottom Line
|
||||
|
||||
1. Open `QUICK_REBASE_GUIDE.md`
|
||||
2. Run the 5 commands
|
||||
3. Done!
|
||||
|
||||
Your PR will be clean and ready to merge.
|
||||
|
||||
---
|
||||
|
||||
**Last Updated:** 2026-01-31
|
||||
**PR:** #40 - Add Levitate effect restoration for non-client mobs
|
||||
**Status:** Awaiting rebase to resolve conflicts
|
||||
@ -1,142 +0,0 @@
|
||||
# Instructions to Resolve PR #40 Merge Conflicts
|
||||
|
||||
## Current Situation
|
||||
|
||||
**Problem:** PR #40 has merge conflicts because:
|
||||
- Your PR branch (`copilot/sub-pr-39`) is at commit `6e2a9a4` (old state)
|
||||
- The base branch (`fix/buff-suppression-pet-restore`) has moved forward to commit `b19503a`
|
||||
- The base branch now includes fixes that were in your PR, causing conflicts
|
||||
- GitHub shows the PR as not mergeable (`mergeable: false`, `mergeable_state: "dirty"`)
|
||||
|
||||
**Why this happened:** The base branch was updated with the `return false;` → `return;` fix and nimbus effect restoration that were originally part of your PR. Now those commits are redundant and causing conflicts.
|
||||
|
||||
## Solution: Rebase Your Branch
|
||||
|
||||
You need to rebase your PR branch onto the latest base branch. This will:
|
||||
1. Remove redundant commits that are now in the base branch
|
||||
2. Keep only the Levitate restoration feature
|
||||
3. Resolve all conflicts
|
||||
|
||||
## Step-by-Step Instructions
|
||||
|
||||
### Option 1: Manual Rebase (Recommended)
|
||||
|
||||
Run these commands in your local repository:
|
||||
|
||||
```bash
|
||||
# 1. Make sure you're on the PR branch
|
||||
git checkout copilot/sub-pr-39
|
||||
|
||||
# 2. Fetch the latest changes
|
||||
git fetch origin
|
||||
|
||||
# 3. Rebase onto the latest base branch
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
|
||||
# 4. When git reports a conflict in the validation check, skip it (it's redundant)
|
||||
# Git will show a conflict like:
|
||||
# <<<<<<< HEAD
|
||||
# if (!IsValidSpell(buffs[slot].spellid))
|
||||
# return;
|
||||
# =======
|
||||
# if (!IsValidSpell(buffs[slot].spellid)) {
|
||||
# return;
|
||||
# }
|
||||
# >>>>>>> (your commit)
|
||||
#
|
||||
# Skip this commit since the base already has the fix:
|
||||
git rebase --skip
|
||||
|
||||
# 5. Git will automatically drop the "Resolve merge conflict" commit
|
||||
# The rebase should complete successfully
|
||||
|
||||
# 6. Force-push the rebased branch
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
### Option 2: Using GitHub CLI
|
||||
|
||||
If you have GitHub CLI installed:
|
||||
|
||||
```bash
|
||||
# Update the PR branch
|
||||
gh pr checkout 40
|
||||
git fetch origin
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
git rebase --skip # When prompted about the validation conflict
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
### Option 3: Reset and Cherry-pick
|
||||
|
||||
If the rebase seems complicated, you can reset to the base and cherry-pick only the Levitate commit:
|
||||
|
||||
```bash
|
||||
# 1. Fetch latest
|
||||
git fetch origin
|
||||
|
||||
# 2. Create a backup of your current branch
|
||||
git branch copilot/sub-pr-39-backup
|
||||
|
||||
# 3. Reset your branch to the base
|
||||
git checkout copilot/sub-pr-39
|
||||
git reset --hard origin/fix/buff-suppression-pet-restore
|
||||
|
||||
# 4. Cherry-pick only the Levitate restoration commit (03f7704)
|
||||
git cherry-pick 03f7704
|
||||
|
||||
# 5. Force-push
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
## Expected Result
|
||||
|
||||
After successful rebase, your branch will have:
|
||||
- **2 commits** total:
|
||||
- Initial plan commit
|
||||
- Levitate restoration commit
|
||||
- **Base:** `fix/buff-suppression-pet-restore` at commit `b19503a`
|
||||
- **No conflicts** - the PR will be mergeable
|
||||
|
||||
The validation fix and nimbus restoration will be inherited from the base branch, not part of your PR's changes.
|
||||
|
||||
## What Changed
|
||||
|
||||
### Before Rebase:
|
||||
- 4 commits in your PR
|
||||
- Includes validation fix (`return false;` → `return;`)
|
||||
- Includes merge conflict resolution commit
|
||||
- Conflicts with base branch
|
||||
|
||||
### After Rebase:
|
||||
- 2 commits in your PR
|
||||
- Only Levitate restoration feature
|
||||
- Clean history based on latest base branch
|
||||
- No conflicts
|
||||
|
||||
## Files Affected
|
||||
|
||||
Your PR will only modify:
|
||||
- `zone/spell_effects.cpp` - Lines 4722-4735 (Levitate case added to switch statement)
|
||||
|
||||
## Need Help?
|
||||
|
||||
If you encounter issues:
|
||||
1. Check that you're on the correct branch: `git branch`
|
||||
2. Verify the base branch SHA: `git ls-remote origin fix/buff-suppression-pet-restore`
|
||||
3. If stuck during rebase: `git rebase --abort` to start over
|
||||
4. Check the PR status: https://github.com/Valorith/Server/pull/40
|
||||
|
||||
## Additional Notes
|
||||
|
||||
- **Why `--force-with-lease`?** This is safer than `--force` because it won't overwrite the remote branch if someone else pushed to it
|
||||
- **Why skip the validation commit?** The base branch already has `return;` (correct), so your commit adding the same fix is redundant
|
||||
- **Is this safe?** Yes, rebasing removes redundant commits while keeping your Levitate feature intact
|
||||
|
||||
## Verification
|
||||
|
||||
After pushing, verify on GitHub:
|
||||
1. Go to https://github.com/Valorith/Server/pull/40
|
||||
2. Check that "This branch has no conflicts with the base branch" appears
|
||||
3. Verify only 2 commits are shown
|
||||
4. Confirm the changes show only the Levitate restoration code
|
||||
@ -1,157 +0,0 @@
|
||||
# Visual Guide: PR #40 Rebase Process
|
||||
|
||||
## Current State (BEFORE Rebase)
|
||||
|
||||
```
|
||||
fix/buff-suppression-pet-restore (base branch)
|
||||
│
|
||||
├─ b19503a ← Merge PR #42 (includes return; fix)
|
||||
│ ├─ 4faf48a ← Merge PR #43 (includes return; fix)
|
||||
│ ├─ ff7dbce ← Fix compilation: return false → return
|
||||
│ └─ ...more commits with validation fixes
|
||||
│
|
||||
└─ dffc461 ← Old base (what your PR was originally based on)
|
||||
│
|
||||
└─ copilot/sub-pr-39 (your branch) ← CONFLICTS HERE!
|
||||
├─ 6e2a9a4 ← Resolve merge conflict
|
||||
├─ 597e6eb ← Add validation check (return;)
|
||||
├─ 03f7704 ← Add Levitate restoration ✓ (THIS IS WHAT WE WANT)
|
||||
└─ 950e644 ← Initial plan
|
||||
```
|
||||
|
||||
**Problem:** Your commits 597e6eb and 6e2a9a4 add the same fix that's already in b19503a!
|
||||
|
||||
---
|
||||
|
||||
## After Rebase (TARGET State)
|
||||
|
||||
```
|
||||
fix/buff-suppression-pet-restore (base branch)
|
||||
│
|
||||
├─ b19503a ← Merge PR #42 (includes return; fix & nimbus)
|
||||
│ ├─ 4faf48a ← Merge PR #43
|
||||
│ ├─ ff7dbce ← Fix compilation
|
||||
│ └─ ...
|
||||
│
|
||||
└─ copilot/sub-pr-39 (your branch - rebased) ← CLEAN!
|
||||
├─ f94cb8d ← Add Levitate restoration ✓
|
||||
└─ dee427b ← Initial plan
|
||||
```
|
||||
|
||||
**Result:** Clean history with only your Levitate feature!
|
||||
|
||||
---
|
||||
|
||||
## What the Rebase Does
|
||||
|
||||
### Step 1: Replay Your Commits
|
||||
```
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
```
|
||||
Git attempts to replay your commits on top of b19503a:
|
||||
- ✓ 950e644 (Initial plan) → dee427b
|
||||
- ⚠️ 597e6eb (Add validation) → **CONFLICT** (already in base)
|
||||
- ⏭️ Skip this commit with: `git rebase --skip`
|
||||
- ⏭️ 6e2a9a4 automatically dropped (contents already upstream)
|
||||
- ✓ 03f7704 (Add Levitate) → f94cb8d
|
||||
|
||||
### Step 2: Force Push
|
||||
```
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
Updates the remote branch with the clean history.
|
||||
|
||||
---
|
||||
|
||||
## The Conflict Explained
|
||||
|
||||
When rebasing, Git will show:
|
||||
|
||||
```cpp
|
||||
<<<<<<< HEAD (base branch - what's already there)
|
||||
if (!IsValidSpell(buffs[slot].spellid))
|
||||
return;
|
||||
=======
|
||||
if (!IsValidSpell(buffs[slot].spellid)) { (your commit - same fix!)
|
||||
return;
|
||||
}
|
||||
>>>>>>> 597e6eb (Add validation check)
|
||||
```
|
||||
|
||||
**Both sides have `return;`** - just different formatting!
|
||||
Since the base already has the fix, skip your commit: `git rebase --skip`
|
||||
|
||||
---
|
||||
|
||||
## Commit Details
|
||||
|
||||
### Your Levitate Commit (03f7704)
|
||||
This is the ONLY commit that should remain in your PR:
|
||||
|
||||
```cpp
|
||||
case SpellEffect::Levitate:
|
||||
{
|
||||
if (!zone->CanLevitate()) {
|
||||
SendAppearancePacket(AppearanceType::FlyMode, 0);
|
||||
BuffFadeByEffect(SpellEffect::Levitate);
|
||||
} else {
|
||||
if (spell.limit_value[i] == 1) {
|
||||
SendAppearancePacket(AppearanceType::FlyMode,
|
||||
EQ::constants::GravityBehavior::LevitateWhileRunning);
|
||||
} else {
|
||||
SendAppearancePacket(AppearanceType::FlyMode,
|
||||
EQ::constants::GravityBehavior::Levitating);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
```
|
||||
|
||||
Location: `zone/spell_effects.cpp` lines 4722-4735
|
||||
|
||||
---
|
||||
|
||||
## Quick Reference Commands
|
||||
|
||||
```bash
|
||||
# The complete rebase process
|
||||
git checkout copilot/sub-pr-39
|
||||
git fetch origin
|
||||
git rebase origin/fix/buff-suppression-pet-restore
|
||||
# When conflict appears:
|
||||
git rebase --skip
|
||||
# After rebase completes:
|
||||
git push --force-with-lease origin copilot/sub-pr-39
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### If rebase fails with different error:
|
||||
```bash
|
||||
git rebase --abort
|
||||
# Try again or use Option 3 (cherry-pick)
|
||||
```
|
||||
|
||||
### To see what will change:
|
||||
```bash
|
||||
git log origin/fix/buff-suppression-pet-restore..HEAD --oneline
|
||||
```
|
||||
|
||||
### To verify base branch:
|
||||
```bash
|
||||
git fetch origin
|
||||
git show origin/fix/buff-suppression-pet-restore:zone/spell_effects.cpp | grep -A3 "IsValidSpell"
|
||||
# Should show: if (!IsValidSpell(buffs[slot].spellid))
|
||||
# return;
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Why This is Safe
|
||||
|
||||
1. **Your Levitate code is preserved** - The commit 03f7704 will be replayed as-is
|
||||
2. **No data loss** - Redundant commits are removed because they're already in base
|
||||
3. **Cleaner history** - Removes duplicate/conflicting commits
|
||||
4. **PR becomes mergeable** - No conflicts after rebase
|
||||
|
||||
The validation fix you added is not lost - it's already in the base branch!
|
||||
Loading…
x
Reference in New Issue
Block a user