Andy Park
10/04/2023, 6:10 PMgt sync && gt restack the same as doing gt sync? Since gt sync --restack is the default behavior, I am a bit confused.Jacob Gold
10/04/2023, 6:13 PMgt restack will restack your current branch even if syncing reveals new conflicts — sync just informs you that you have conflicts and exitsJacob Gold
10/04/2023, 6:13 PMrestackAndy Park
10/04/2023, 6:19 PMAndy Park
10/04/2023, 6:19 PMAndy Park
10/04/2023, 6:19 PMgt sync --restack equivalent to gt sync && gt restack?Jacob Gold
10/04/2023, 6:21 PMgt sync (as long as you don't pass --no-restack) restacks all of your branches that can be restacked without manual resolution.
If you current stack has manual resolution required, you'll need to run gt restack to do that.
To resolve conflicts in other stacks, you would check out a branch from that stack and then run gt restackJacob Gold
10/04/2023, 6:21 PMgt sync and you don't have conflicts to resolve in your current stack, gt restack will no-op