Don Alvarez
12/18/2023, 8:00 PMgt create 's
I switched to 1st branch and did gt submit
I switched to 2nd branch and did a second gt submit
I went to the graphite web site for the first PR and clicked "merge"
I switched to the 2nd branch in the stack and did a gt sync
I did NOT delete the 1st branch (sticking with old patterns for now until I have full success with graphite)
I did a gt restack and was told the first branch did not need to be restacked on main and the 2nd branch did not need to be restacked on the 1st branch.
I went to the graphite web page for the 2nd PR and I see this a UI which seems to be telling me my PR is ready to approve and merge (left side of screenshot) and my PR is not ready to merge (right side of screenshot) and there is no guidance I can find on what to do to resolve this disagreement.Aryaman
12/18/2023, 8:14 PMgt sync should have prompted you to delete the first branch locally. Did you see that?Don Alvarez
12/18/2023, 8:16 PMAryaman
12/18/2023, 8:18 PMI chose not to delete. Graphite didn't indicate there was anything workflow breaking about that choice, it simply asked me if I wanted to delete and I said no.I think it is fine not to delete it locally. However, you might need to move the second branch onto
main to make this work correctly.
$ gt checkout main
$ git log // Ensure first PR is in main
$ gt checkout <second branch>
$ gt move --onto main
$ gt submitAryaman
12/18/2023, 8:18 PMDon Alvarez
12/18/2023, 8:24 PMDon Alvarez
12/18/2023, 8:27 PMDon Alvarez
12/18/2023, 8:30 PMgt move --onto main resulted in (branch name) does not need to be restacked on mainDon Alvarez
12/18/2023, 8:32 PMDon Alvarez
12/18/2023, 8:32 PMgt submit at this point?Aryaman
12/18/2023, 8:42 PMgt log show your second branch being based off main?Don Alvarez
12/18/2023, 8:46 PM◉ 2nd-branch (current)
│ 73 minutes ago
│
│ PR #8 (Ready to merge) pr name
│ <https://app.graphite.dev/github/pr/yoDon/reponame/8>
│ Last submitted version: v1 (local changes, need submit)
│
│ bd77f59 - commit name
│
◯ main
│ 77 minutes ago
│
│ 60ebfcc - pr name (#7)
│Aryaman
12/18/2023, 8:47 PMgt submit thisAryaman
12/18/2023, 8:47 PMDon Alvarez
12/18/2023, 8:49 PMAryaman
12/18/2023, 8:50 PMAryaman
12/18/2023, 8:51 PMDon Alvarez
12/18/2023, 8:51 PMDon Alvarez
12/18/2023, 8:52 PMAryaman
12/18/2023, 8:52 PMDon Alvarez
12/18/2023, 8:53 PMJacob Gold
12/18/2023, 9:12 PM