• You've discovered RedGuides 📕 an EverQuest multi-boxing community 🛡️🧙🗡️. We want you to play several EQ characters at once, come join us and say hello! 👋
  • Hail Guest, RedGuides is proud to announce the official release of MacroQuest, which we're now using as the base for Very Vanilla. Join the release party!
  • IS THIS SITE UGLY? Click "RG3" at the very bottom-left of this page to change it. To dismiss this notice, click the X --->

Tech - [git] Having trouble rebasing with submodules (1 Viewer)

Redbot

🖥️💖
Moderator
Joined
Oct 15, 2004
RedCents
68,310¢
I'm playing in the redbot branch,

submodules are giving me a heck of a time, notably src/eqlib

Bash:
PS D:\Users\Redbot\work_local\redguides\openvanilla> git status
On branch redbot
Your branch is up to date with 'origin/redbot'.

nothing to commit, working tree clean
PS D:\Users\Redbot\work_local\redguides\openvanilla> git fetch mq master
From https://gitlab.com/macroquest/next/mqnext
 * branch              master     -> FETCH_HEAD
PS D:\Users\Redbot\work_local\redguides\openvanilla> git rebase mq/master
warning: unable to rmdir 'plugins/MQ2AASpend': Directory not empty
warning: unable to rmdir 'plugins/MQ2AdvPath': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoAccept': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoCamp': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoClaim': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoForage': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoGroup': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoLoot': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoLootSort': Directory not empty
warning: unable to rmdir 'plugins/MQ2AutoSize': Directory not empty
warning: unable to rmdir 'plugins/MQ2Bandolier': Directory not empty
warning: unable to rmdir 'plugins/MQ2BardSwap': Directory not empty
warning: unable to rmdir 'plugins/MQ2Boxr': Directory not empty
warning: unable to rmdir 'plugins/MQ2CPULoad': Directory not empty
warning: unable to rmdir 'plugins/MQ2Camera': Directory not empty
warning: unable to rmdir 'plugins/MQ2Cast': Directory not empty
warning: unable to rmdir 'plugins/MQ2Clipboard': Directory not empty
warning: unable to rmdir 'plugins/MQ2Collections': Directory not empty
warning: unable to rmdir 'plugins/MQ2Cursor': Directory not empty
warning: unable to rmdir 'plugins/MQ2DPSAdv': Directory not empty
warning: unable to rmdir 'plugins/MQ2Dan': Directory not empty
warning: unable to rmdir 'plugins/MQ2Debuffs': Directory not empty
warning: unable to rmdir 'plugins/MQ2Discord': Directory not empty
warning: unable to rmdir 'plugins/MQ2EQBC': Directory not empty
warning: unable to rmdir 'plugins/MQ2EasyFind': Directory not empty
warning: unable to rmdir 'plugins/MQ2Events': Directory not empty
warning: unable to rmdir 'plugins/MQ2Exchange': Directory not empty
warning: unable to rmdir 'plugins/MQ2FarmTest': Directory not empty
warning: unable to rmdir 'plugins/MQ2FeedMe': Directory not empty
warning: unable to rmdir 'plugins/MQ2GMCheck': Directory not empty
warning: unable to rmdir 'plugins/MQ2GroupInfo': Directory not empty
warning: unable to rmdir 'plugins/MQ2HUDMove': Directory not empty
warning: unable to rmdir 'plugins/MQ2ItemScore': Directory not empty
warning: unable to rmdir 'plugins/MQ2KillTracker': Directory not empty
warning: unable to rmdir 'plugins/MQ2KissTemplate': Directory not empty
warning: unable to rmdir 'plugins/MQ2LinkDB': Directory not empty
warning: unable to rmdir 'plugins/MQ2Log': Directory not empty
warning: unable to rmdir 'plugins/MQ2LootManager': Directory not empty
warning: unable to rmdir 'plugins/MQ2Medley': Directory not empty
warning: unable to rmdir 'plugins/MQ2Melee': Directory not empty
warning: unable to rmdir 'plugins/MQ2MoveUtils': Directory not empty
warning: unable to rmdir 'plugins/MQ2MyButtons': Directory not empty
warning: unable to rmdir 'plugins/MQ2Nav': Directory not empty
warning: unable to rmdir 'plugins/MQ2NetBots': Directory not empty
warning: unable to rmdir 'plugins/MQ2Notepad': Directory not empty
warning: unable to rmdir 'plugins/MQ2OTD': Directory not empty
warning: unable to rmdir 'plugins/MQ2Paranoid': Directory not empty
warning: unable to rmdir 'plugins/MQ2PlatTracker': Directory not empty
warning: unable to rmdir 'plugins/MQ2PluginManager': Directory not empty
warning: unable to rmdir 'plugins/MQ2PortalSetter': Directory not empty
warning: unable to rmdir 'plugins/MQ2Posse': Directory not empty
warning: unable to rmdir 'plugins/MQ2Profiler': Directory not empty
warning: unable to rmdir 'plugins/MQ2RaidUtils': Directory not empty
warning: unable to rmdir 'plugins/MQ2Rand': Directory not empty
warning: unable to rmdir 'plugins/MQ2React': Directory not empty
warning: unable to rmdir 'plugins/MQ2RelayTells': Directory not empty
warning: unable to rmdir 'plugins/MQ2Relocate': Directory not empty
warning: unable to rmdir 'plugins/MQ2Rewards': Directory not empty
warning: unable to rmdir 'plugins/MQ2Rez': Directory not empty
warning: unable to rmdir 'plugins/MQ2SQLite': Directory not empty
warning: unable to rmdir 'plugins/MQ2Say': Directory not empty
warning: unable to rmdir 'plugins/MQ2ShellCmd': Directory not empty
warning: unable to rmdir 'plugins/MQ2SpawnMaster': Directory not empty
warning: unable to rmdir 'plugins/MQ2SpawnSort': Directory not empty
warning: unable to rmdir 'plugins/MQ2Spawns': Directory not empty
warning: unable to rmdir 'plugins/MQ2Status': Directory not empty
warning: unable to rmdir 'plugins/MQ2TSTrophy': Directory not empty
warning: unable to rmdir 'plugins/MQ2TributeManager': Directory not empty
warning: unable to rmdir 'plugins/MQ2Twist': Directory not empty
warning: unable to rmdir 'plugins/MQ2WorstHurt': Directory not empty
warning: unable to rmdir 'plugins/MQ2XAssist': Directory not empty
warning: unable to rmdir 'plugins/MQ2XPTracker': Directory not empty
warning: unable to rmdir 'plugins/MQItemColor': Directory not empty
First, rewinding head to replay your work on top of it...
Applying: adding some old friends
Applying: updating submodules
Applying: Plugins added to solution
Applying: adding mesh updater
Applying: Update for 2021-12-09 patch
Using index info to reconstruct a base tree...
M       src/eqlib
Falling back to patching base and 3-way merge...
Failed to merge submodule src/eqlib (commits don't follow merge-base)
Auto-merging src/eqlib
CONFLICT (submodule): Merge conflict in src/eqlib
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0005 Update for 2021-12-09 patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
PS D:\Users\Redbot\work_local\redguides\openvanilla> git status
rebase in progress; onto 22a67f42
You are currently rebasing branch 'redbot' on '22a67f42'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   src/eqlib

no changes added to commit (use "git add" and/or "git commit -a")
PS D:\Users\Redbot\work_local\redguides\openvanilla>

git add src/eqlib doesn't help.

If I start over and do a merge rather than rebase I have no issues, but the git log looks messy

Bash:
PS D:\Users\Trevor\work_local\redguides\openvanilla> git fetch mq master
From https://gitlab.com/macroquest/next/mqnext
 * branch              master     -> FETCH_HEAD
PS D:\Users\Trevor\work_local\redguides\openvanilla> git merge -Xtheirs mq/master
Auto-merging data/resources/CHANGELOG.md
Merge made by the 'recursive' strategy.
 data/resources/CHANGELOG.md |  3 ++
 src/main/MQ2Commands.cpp    | 85 +++++++++++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 34 deletions(-)
PS D:\Users\Trevor\work_local\redguides\openvanilla> git status
On branch redbot
Your branch is ahead of 'origin/redbot' by 10 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
PS D:\Users\Trevor\work_local\redguides\openvanilla> git submodule update
PS D:\Users\Trevor\work_local\redguides\openvanilla>
PS D:\Users\Trevor\work_local\redguides\openvanilla> git submodule init
PS D:\Users\Trevor\work_local\redguides\openvanilla> git status
On branch redbot
Your branch is ahead of 'origin/redbot' by 10 commits.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean


PS D:\Users\Trevor\work_local\redguides\openvanilla> git log
commit e1579ed806e3f7f62e5723734025760108e08c59 (HEAD -> redbot)
Merge: 5eecea1d 22a67f42
Author: Red Bot <[email protected]>
Date:   Sun Dec 26 11:22:35 2021 -0600

    Merge remote-tracking branch 'mq/master' into redbot

commit 22a67f42022966b0e2a127cda3814b7b8f6ef294 (mq/master)
Author: Knightly <[email protected]>
Date:   Sat Dec 25 12:46:24 2021 -1000

    Add clear to itemtarget and doortarget

commit 5eecea1d2531229dc790c66c5a60eadeb0aefae3 (origin/redbot)
Author: Knightly <[email protected]>
Date:   Thu Dec 16 17:01:27 2021 -1000

    Add LocalEcho toggle to Console (Fixes #117)

commit a33fb1eb3018b28eff47c6719129fa0d16991f01
Author: brainiac <[email protected]>
Date:   Wed Dec 15 18:25:27 2021 -0800

    Fix Me.SpellRankCap (Fixes #430)

commit 3c6beac8c4c36c34db19be4afa7cc365c35960dd
Author: Knightly <[email protected]>
Date:   Wed Dec 15 15:03:12 2021 -1000

    Fix Me.Invis for Rogue SOS - #416

commit ca7b1448ad4f139903b1d73e40cc3227c588c9cd
Author: Knightly <[email protected]>
Date:   Wed Dec 15 13:31:13 2021 -1000

    Fix Moving when moving backwards

commit ef77538f431d6df30ba60fd14814bf1b6c40109d
Author: Knightly <[email protected]>
Date:   Wed Dec 15 09:38:06 2021 -1000

    Update vcpkg

commit 6c63149745d1dcc801b53023ece77535087cdf4c
Author: Knightly <[email protected]>
Date:   Wed Dec 15 09:37:27 2021 -1000

    Explicitly add algorithm for Hotkeys

commit b4d00550476cec6d6409f84bd950184b64ea7b65
Author: Knightly <k[email protected]>
Date:   Wed Dec 15 09:35:59 2021 -1000

    Add VitalityCap Members for parity
 

brainiac

Moderator
Joined
Apr 9, 2008
RedCents
6,011¢
You’re working in a separate branch, the natural order of things would be to merge.

Trying to rebase all your submodule additions means deleting everything, rolling up to the latest master, and replaying your additions. You’d have to close everything down and clean everything because adding/removing submodules that way gets messy

Second, sounds like you modified the eqlib reference. Eqlib should never conflict otherwise. Check your change history, I bet that you accidentally modified it without realizing

If you’re making changes to master you would rebase those before submitting a change request. If you are maintaining a second branch you should merge to avoid needing to resolve these changes every time
 

Users who are viewing this thread

Top