You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Most of the time, I have multiple stacks concurrently, and I know that a couple of them will not be merged in the near future.
It would be nice if we could mark those stacks or first branches as parked (I borrowed the term from Git Town), so when we run a restack on the trunk (or repo restack#505), we would skip restacking those.
We should also add a --force flag to force restacking parked stacks or branches.
The text was updated successfully, but these errors were encountered:
That's a cool idea! Right now I untrack branches that I'm pausing. This feels like a better way to go about it.
It would be pretty straightforward to add a "parked" bit to branch state (or a branch "type" in anticipation of other kinds of branches).
I can imagine variants of this operation for all stack scopes (branch, stack, upstack, and downstack).
I think the main question here is the naming and how to initiate the reverse.
# e.g.
gs branch park
gs branch unpark
# or this
gs branch freeze
gs branch thaw
Thinking out loud/confirming:
Parking/freezing would prevent the PR from getting auto-restacked from any scope ({upstack, stack, repo} restack).
Only branch restack would explicitly restack parked branches.
I can see this being quite useful in my own workflow as well.
I sometimes start off a side-stack in the middle of a stack for exploratory work/experimentation that I'm not committed to yet.
If I then go back down and make a significant change to the lower branches, I don't want the exploratory branch(es) to be restacked or to resolve their conflicts until I'm sure I want to explore that route more.
Most of the time, I have multiple stacks concurrently, and I know that a couple of them will not be merged in the near future.
It would be nice if we could mark those stacks or first branches as parked (I borrowed the term from Git Town), so when we run a restack on the trunk (or
repo restack
#505), we would skip restacking those.We should also add a
--force
flag to force restacking parked stacks or branches.The text was updated successfully, but these errors were encountered: