This message was deleted.

hey @Anshul Aggarwal! before i take a look at your PR wanted to quickly check to make sure you did a

gt stack restack

and resubmitted the PR if you made any changes to the big change - sorry if this is super obvious

That does make sense, I think in this instance I’d had both the pr’s, clicked merge on the top one (2058) and once the bottom one had merged the diff between the top one and main was the combination of both prs which was strange. Maybe that’s bc I should have done it individually and run gt stack restack between each merge?

@Anshul Aggarwal we generally recommend merging from bottom to top.

Hmm, I guess in my head that should “just work” when I click the

Merge Stack of 6

button. Is it not possible for Graphite to run the

gt stack restack

command on the server side instead of me doing it manually everytime? I ask because that’s pretty much the same flow I would have to do for github anyways Definitely aggressive question, trying to figure out where/how this tool works for my use case so definitely understand if this isn’t a covered use case

Yes, the

Merge stack of 6

button should just work and merge all (option 1 in my message above). So to be clear, this button did not work for you, correct? Do you have a merge job number so we can look into why it failed? cc: @Jacob Gold

Yeah this was the link to the PR, I think the job id is 2052? https://app.graphite.dev/github/pr/withbroadcast/broadcast/2052/Searching-for-Linear-Users I made a thread here about it https://graphite-community.slack.com/archives/C02ENKC0A9X/p1677443950800309 Generally the merge stack of 6 has worked pretty nicely for me for the last few months I’ve only noticed it breaking pretty frequently this last week. Definitely loving the tool so was confused/assumed I must have done something wrong in the set up of the branches or something

Hi! we pushed a change last night that should fix this issue - i.e. perform the rebase correctly on our end 🙂

Wooo thank ya I’ll give it a try soon, I’m building another 6+ diff stack right now (we love shifting deadlines and PRDs 🤦‍♂️) so should be able to test it again? I’ll let yall know if I run into another issue