Skip to content

QUICK_FIX.md

Latest commit

 

History

History
72 lines (50 loc) · 1.73 KB

QUICK_FIX.md

File metadata and controls

72 lines (50 loc) · 1.73 KB
Raw

Quick Fix - Get Your Commits on the Branch

What Happened

Your commits are on master, but you created an empty feat/oracle-rescue-tool branch.

Fastest Fix (GitHub Desktop)

1. Open GitHub Desktop

2. Switch to "master" branch

  • Top left: Click "Current Branch"
  • Select "master"
  • You'll see your commit: "feat(oracle): Add comprehensive rescue tool..."

3. Right-click your commit

  • Select "Cherry-pick commit..."
  • Choose: feat/oracle-rescue-tool
  • Click "Cherry-pick"

4. Switch to feature branch

  • Click "Current Branch"
  • Select "feat/oracle-rescue-tool"
  • You should now see your commit here!

5. Push

  • Click "Push origin" button at top

6. Create PR

Alternative: Command Line

If GitHub Desktop doesn't work:

# 1. Kill gh.exe in Task Manager first!

# 2. Open new terminal
cd C:\Users\TOSHIBA\Desktop\tikka

# 3. Switch to feature branch
git checkout feat/oracle-rescue-tool

# 4. Cherry-pick the commit from master
git cherry-pick 7e067e5

# 5. Push
git push -u origin feat/oracle-rescue-tool

Verify It Worked

On GitHub, go to: https://github.com/crackedstudio/tikka/tree/feat/oracle-rescue-tool/oracle

You should see:

  • src/rescue/ folder with 5 files
  • New documentation files (RESCUE_*.md)
  • Updated README.md

Then Create PR

Go to: https://github.com/crackedstudio/tikka/pulls

  • Click "New Pull Request"
  • Base: master ← Compare: feat/oracle-rescue-tool
  • You should see "22 files changed, 4,418 additions"
  • Click "Create Pull Request"

TL;DR: Use GitHub Desktop to cherry-pick your commit from master to the feature branch, then push! 🚀