zlacker

[return to "Stacked Diffs with git rebase —onto"]
1. Fang_+61f[view] [source] 2025-12-05 13:54:30
>>flexdi+(OP)
Is there any reason besides merge commits ending up in history to not do this with merges instead? ie merge main into feature-1, then feature-1 into feature-2.

Sounds like using --update-refs would let you do all that in a single operation, but you still need to force-push and don't maintain an explicit merge/conflict resolution history, both of which could be considered sub-optimal for collaborative scenarios.

◧◩
2. happyt+e6f[view] [source] 2025-12-05 14:20:17
>>Fang_+61f
The use case is that they are not ready to merge yet.
[go to top]