They meant merging the other way, i.e. merging the new changes from main into the stacked feature branches.
This is functionally the same as rebasing, except that the new changes show up at the tip of the commit chain rather than the base. And because it doesn't rewrite history you don't need to force-push.
They meant merging the other way, i.e. merging the new changes from main into the stacked feature branches.
This is functionally the same as rebasing, except that the new changes show up at the tip of the commit chain rather than the base. And because it doesn't rewrite history you don't need to force-push.