is there a way to squash a branch without restacki...
# how-do-i
e
is there a way to squash a branch without restacking its upstack branches natively? i ended up having to do
gt squash
and squash the branch, and then `Hit conflict restacking B on A``, ran
git rebase --abort
since
gt abort
would have aborted the squash instead
✅ 1
p
(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state
j
squash should have been moved to a clean restack (what sync does, only restack if no conflicts) a while ago, aborting with git is the best thing for now but will fix this!
my guy is on it
🫡 1
e
sweet! thatd be great