Bob Walton
05/24/2023, 10:56 PMgt stack restack
….
(1) resolve the listed merge conflicts
(2) mark them as resolved with gt add .
(3) run gt continue to continue executing your previous Graphite command
It's safe to cancel the ongoing rebase with `gt rebase --abort`.
After I ran gt add .
per the instructions.
Command: "add" is not a Graphite command, but is supported by git. Passing command through to git...
Running: "git add ."
Aryaman
05/24/2023, 10:57 PMBob Walton
05/24/2023, 10:58 PMgt add
as a valid graphite command.Aryaman
05/24/2023, 10:59 PMJacob Gold
05/24/2023, 11:00 PM