If I’m stacking on top of somebody else’s PR, how ...
# how-do-it
Tyler Laprade
12/12/2023, 7:10 PMIf I’m stacking on top of somebody else’s PR, how do I avoid rebasing their branch?
j
Jacob Gold
12/12/2023, 7:10 PMThere currently is not a way to do that aside from running
sync --no-restack❤️ 1
t
Tyler Laprade
12/12/2023, 7:11 PMI’m inferring from GTI that I’ve already restacked it a bit - is there a way for me to undo that?
Tyler Laprade
12/12/2023, 7:11 PM(I’m assuming based on the fact that I have a
Submit 2 PRsTyler Laprade
12/12/2023, 7:14 PMI can’t bring my branch back to trunk, delete the other one, and re-pull because I’ve already resolved merge conflicts relative to the other branch
Tyler Laprade
12/12/2023, 7:21 PMActually, I did exactly that and it worked fine. I had to do a bunch of “Accept Incoming” for the merge conflicts in both directions when moving it each time, but that was it
2 Views