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
Suppose I have a stack and the lowest one gets merged, while work on one higher up the stack is still in progress. Due to the way the automatic rebasing recreates all the commits and does a force-push, so the developer working on the PR higher in the stack that builds on/extends that branch further can't do a git pull without a "divergent branches" interruption and comments made to date on the upper PR lose their connection to where in the code the comment was on. Any rules against use of force-push are automatically violated by GitHub. Comments elsewhere referencing the particular commit an issue was fixed in become useless dead links.
For us, that makes Stacks a feature to intentionally avoid. With or without stacks, the base branch for the second PR correctly automatically adjusts, but rewriting commits and force-pushing a branch is really undesired behavior and there should be some setting to adjust that rebase behavior.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
Suppose I have a stack and the lowest one gets merged, while work on one higher up the stack is still in progress. Due to the way the automatic rebasing recreates all the commits and does a force-push, so the developer working on the PR higher in the stack that builds on/extends that branch further can't do a
git pullwithout a "divergent branches" interruption and comments made to date on the upper PR lose their connection to where in the code the comment was on. Any rules against use of force-push are automatically violated by GitHub. Comments elsewhere referencing the particular commit an issue was fixed in become useless dead links.For us, that makes Stacks a feature to intentionally avoid. With or without stacks, the base branch for the second PR correctly automatically adjusts, but rewriting commits and force-pushing a branch is really undesired behavior and there should be some setting to adjust that rebase behavior.
All reactions