https://linen.dev logo
Title
b

Bob Walton

05/24/2023, 10:56 PM
Noticed a lil inaccuracy in the conflict resolution instructions after a
gt 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 ."
a

Aryaman

05/24/2023, 10:57 PM
It should be git add -A
If user is in the wrong dir
b

Bob Walton

05/24/2023, 10:58 PM
To be clear my report is that it incorrectly references
gt add
as a valid graphite command.
a

Aryaman

05/24/2023, 10:59 PM
Ah I see. It used to work, seems like a regression... cc @Jacob Gold
j

Jacob Gold

05/24/2023, 11:00 PM
this does work, it just displays that message
so you know it’s passing through to git!
👍 1