This message was deleted Graphite Community #how-do-i

Join Slack

This message was deleted.

# how-do-i

Slackbot

07/13/2023, 9:02 PM

This message was deleted.

✅ 1

Pranathi Peri

07/13/2023, 9:29 PM

Hey there! Generally when a branch gets corrupted

gt branch track

should do the trick - what are the rebase issues you're running into with upstack onto?

Jake Byman

07/13/2023, 9:43 PM

So the upstack command looks to re-apply all the commits, so that each commit ended up with a merge conflict 😞

Jacob Gold

07/14/2023, 12:15 AM

hmm, you shouldn't need to

gt uso

in a case like this —

gt branch track --parent C

should have worked without needing to rebase every commit in D

Jake Byman

07/14/2023, 12:37 AM

Oh! I didn’t know about the

--parent

flag, I can try that next time 🙇

Jake Byman

07/14/2023, 12:39 AM

One more question – the way I managed to corrupt this branch was by trying to consolidate commits (not squashing all of them, but just a few). I stupidly rebased over

main

instead of

, is there an interactive squash where I can pick the commits I want to squash together? E.g.

Copy code

pick Initial commit
pick PR comments
squash Oops
squash asdf
squash Can't believe I did that

Jacob Gold

07/14/2023, 12:40 AM

I would recommend just using a standard interactive git rebase for this

👍 1

Jacob Gold

07/14/2023, 12:40 AM

if you have upstack branches you can always use

gt upstack restack

afterwards

Jacob Gold

07/14/2023, 12:41 AM

as long as you don't rebase past the "beginning" of the branch your graphite metadata is safe

Jake Byman

07/14/2023, 12:42 AM

Understood 🙇 That makes sense

Jacob Gold

07/14/2023, 12:42 AM

(back to the

branch track

thing) The

--parent

flag only works when the parent is in the branch being tracked's history, in some cases you may need to use a

rebase --onto

to make that happen before running

track

— we can improve this by having branch track let you interactively select which commits to include as part of the branch and automatically do that

rebase --onto

for you

Jake Byman

07/14/2023, 12:43 AM

Ah, good to know! Yes that would be great to be able to interactively select the commits

2 Views

Open in Slack

Previous Next